astlinux-commits Mailing List for AstLinux (Page 13)

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 .. 11 12 13 14 15 .. 329 > >> (Page 13 of 329)

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

From: <abe...@us...> - 2017-01-26 13:56:16

Revision: 8120
          http://sourceforge.net/p/astlinux/code/8120
Author:   abelbeck
Date:     2017-01-26 13:56:14 +0000 (Thu, 26 Jan 2017)
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	2017-01-26 13:54:54 UTC (rev 8119)
+++ branches/1.0/docs/ChangeLog.txt	2017-01-26 13:56:14 UTC (rev 8120)
@@ -50,8 +50,6 @@
 
 -- nano, version bump to 2.7.4
 
--- screen, version bump to 4.5.0
-
 -- strace, version bump to 4.15
 
 -- sudo, version bump to 1.8.19p2

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

[Astlinux-commits] SF.net SVN: astlinux:[8119] branches/1.0/package/screen

From: <abe...@us...> - 2017-01-26 13:54:56

Revision: 8119
          http://sourceforge.net/p/astlinux/code/8119
Author:   abelbeck
Date:     2017-01-26 13:54:54 +0000 (Thu, 26 Jan 2017)
Log Message:
-----------
Revert r8116, screen, version bump to 4.5.0, security issue.  Back to 4.4.0, Thanks Michael for catching this.

Revision Links:
--------------
    http://sourceforge.net/p/astlinux/code/8116

Modified Paths:
--------------
    branches/1.0/package/screen/screen-0009-install-dir-dependency.patch
    branches/1.0/package/screen/screen.mk

Modified: branches/1.0/package/screen/screen-0009-install-dir-dependency.patch
===================================================================
--- branches/1.0/package/screen/screen-0009-install-dir-dependency.patch	2017-01-22 15:47:41 UTC (rev 8118)
+++ branches/1.0/package/screen/screen-0009-install-dir-dependency.patch	2017-01-26 13:54:54 UTC (rev 8119)
@@ -36,7 +36,7 @@
 -install: installdirs install_bin
 +install: install_bin
  	cd doc ; $(MAKE) install
- 	-if [ -d $(DESTDIR)/usr/lib/terminfo ]; then \
+ 	-if [ -d /usr/lib/terminfo ]; then \
  		PATH="$$PATH:/usr/5bin" tic ${srcdir}/terminfo/screeninfo.src; \
 -- 
 1.8.4.5

Modified: branches/1.0/package/screen/screen.mk
===================================================================
--- branches/1.0/package/screen/screen.mk	2017-01-22 15:47:41 UTC (rev 8118)
+++ branches/1.0/package/screen/screen.mk	2017-01-26 13:54:54 UTC (rev 8119)
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-SCREEN_VERSION = 4.5.0
+SCREEN_VERSION = 4.4.0
 SCREEN_SITE = $(BR2_GNU_MIRROR)/screen
 SCREEN_DEPENDENCIES = ncurses
 SCREEN_AUTORECONF = 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:[8118] branches/1.0/package

From: <abe...@us...> - 2017-01-22 15:47:43

Revision: 8118
          http://sourceforge.net/p/astlinux/code/8118
Author:   abelbeck
Date:     2017-01-22 15:47:41 +0000 (Sun, 22 Jan 2017)
Log Message:
-----------
ddclient and webinterface Network tab, remove Dynamic DNS 'getip.krisk.org' (no longer working), map to default

Modified Paths:
--------------
    branches/1.0/package/ddclient/dynamicdns.init
    branches/1.0/package/webinterface/altweb/admin/network.php

Modified: branches/1.0/package/ddclient/dynamicdns.init
===================================================================
--- branches/1.0/package/ddclient/dynamicdns.init	2017-01-21 22:12:28 UTC (rev 8117)
+++ branches/1.0/package/ddclient/dynamicdns.init	2017-01-22 15:47:41 UTC (rev 8118)
@@ -13,7 +13,7 @@
 
   delay="360"
 
-  if [ -z "$DDGETIP" ]; then
+  if [ -z "$DDGETIP" -o "$DDGETIP" = "getip.krisk.org" ]; then
     web_str="myip.dnsomatic.com/"
   elif [ "$DDGETIP" = "interface" ]; then
     use_web="#"

Modified: branches/1.0/package/webinterface/altweb/admin/network.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/network.php	2017-01-21 22:12:28 UTC (rev 8117)
+++ branches/1.0/package/webinterface/altweb/admin/network.php	2017-01-22 15:47:41 UTC (rev 8118)
@@ -1,6 +1,6 @@
 <?php
 
-// Copyright (C) 2008-2016 Lonnie Abelbeck
+// Copyright (C) 2008-2017 Lonnie Abelbeck
 // This is free software, licensed under the GNU General Public License
 // version 3 as published by the Free Software Foundation; you can
 // redistribute it and/or modify it under the terms of the GNU
@@ -40,6 +40,7 @@
 // 06-07-2016, Added Avahi mDNS/DNS-SD support
 // 07-15-2016, Added 4th LAN Interface
 // 11-14-2016, Added IPsec strongSwan support
+// 01-22-2017, Removed Dynamic DNS 'getip.krisk.org', map to default
 //
 // System location of rc.conf file
 $CONFFILE = '/etc/rc.conf';
@@ -106,7 +107,6 @@
   'User Defined&nbsp;&nbsp;&nbsp;&gt;&gt;&gt;' => '',
   'myip.dnsomatic.com' => 'myip.dnsomatic.com',
   'checkip.dyndns.org' => 'checkip.dyndns.org',
-  'getip.krisk.org' => 'getip.krisk.org',
   'External Interface' => 'interface'
 );
 
@@ -2115,7 +2115,8 @@
   
   putHtml('<tr class="dtrow1"><td style="text-align: left;" colspan="6">');
   putHtml('DNS Get IPv4 Address:');
-  if (($t_value = getVARdef($db, 'DDGETIP', $cur_db)) === '') {
+  $t_value = getVARdef($db, 'DDGETIP', $cur_db);
+  if ($t_value  === '' || $t_value  === 'getip.krisk.org') {
     $t_value = 'myip.dnsomatic.com';
   }
   putHtml('<select name="dd_getip">');

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

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

From: <abe...@us...> - 2017-01-21 22:12:31

Revision: 8117
          http://sourceforge.net/p/astlinux/code/8117
Author:   abelbeck
Date:     2017-01-21 22:12:28 +0000 (Sat, 21 Jan 2017)
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	2017-01-21 22:10:23 UTC (rev 8116)
+++ branches/1.0/docs/ChangeLog.txt	2017-01-21 22:12:28 UTC (rev 8117)
@@ -50,6 +50,8 @@
 
 -- nano, version bump to 2.7.4
 
+-- screen, version bump to 4.5.0
+
 -- strace, version bump to 4.15
 
 -- sudo, version bump to 1.8.19p2

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

[Astlinux-commits] SF.net SVN: astlinux:[8116] branches/1.0/package/screen

From: <abe...@us...> - 2017-01-21 22:10:26

Revision: 8116
          http://sourceforge.net/p/astlinux/code/8116
Author:   abelbeck
Date:     2017-01-21 22:10:23 +0000 (Sat, 21 Jan 2017)
Log Message:
-----------
screen, version bump to 4.5.0

Modified Paths:
--------------
    branches/1.0/package/screen/screen-0009-install-dir-dependency.patch
    branches/1.0/package/screen/screen.mk

Modified: branches/1.0/package/screen/screen-0009-install-dir-dependency.patch
===================================================================
--- branches/1.0/package/screen/screen-0009-install-dir-dependency.patch	2017-01-21 13:13:01 UTC (rev 8115)
+++ branches/1.0/package/screen/screen-0009-install-dir-dependency.patch	2017-01-21 22:10:23 UTC (rev 8116)
@@ -36,7 +36,7 @@
 -install: installdirs install_bin
 +install: install_bin
  	cd doc ; $(MAKE) install
- 	-if [ -d /usr/lib/terminfo ]; then \
+ 	-if [ -d $(DESTDIR)/usr/lib/terminfo ]; then \
  		PATH="$$PATH:/usr/5bin" tic ${srcdir}/terminfo/screeninfo.src; \
 -- 
 1.8.4.5

Modified: branches/1.0/package/screen/screen.mk
===================================================================
--- branches/1.0/package/screen/screen.mk	2017-01-21 13:13:01 UTC (rev 8115)
+++ branches/1.0/package/screen/screen.mk	2017-01-21 22:10:23 UTC (rev 8116)
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-SCREEN_VERSION = 4.4.0
+SCREEN_VERSION = 4.5.0
 SCREEN_SITE = $(BR2_GNU_MIRROR)/screen
 SCREEN_DEPENDENCIES = ncurses
 SCREEN_AUTORECONF = 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:[8115] branches/1.0/package/ddclient/ ddclient-24-cloudflare-JSON-PP.patch

From: <abe...@us...> - 2017-01-21 13:13:03

Revision: 8115
          http://sourceforge.net/p/astlinux/code/8115
Author:   abelbeck
Date:     2017-01-21 13:13:01 +0000 (Sat, 21 Jan 2017)
Log Message:
-----------
ddclient, JSON-PP patch, cosmetic, remove stray space indent

Modified Paths:
--------------
    branches/1.0/package/ddclient/ddclient-24-cloudflare-JSON-PP.patch

Modified: branches/1.0/package/ddclient/ddclient-24-cloudflare-JSON-PP.patch
===================================================================
--- branches/1.0/package/ddclient/ddclient-24-cloudflare-JSON-PP.patch	2017-01-20 18:29:34 UTC (rev 8114)
+++ branches/1.0/package/ddclient/ddclient-24-cloudflare-JSON-PP.patch	2017-01-21 13:13:01 UTC (rev 8115)
@@ -25,7 +25,7 @@
 -			if ($response->{result} eq 'error') {
 -				failed ("%s", $response->{msg});
 +			my $response = eval {decode_json($reply)};
-+ 			if (!defined $response || !defined $response->{result}) {
++			if (!defined $response || !defined $response->{result}) {
 +				failed ("invalid json or result.");
  				next; 
  			}

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

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

From: <abe...@us...> - 2017-01-20 18:29:36

Revision: 8114
          http://sourceforge.net/p/astlinux/code/8114
Author:   abelbeck
Date:     2017-01-20 18:29:34 +0000 (Fri, 20 Jan 2017)
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	2017-01-20 18:28:06 UTC (rev 8113)
+++ branches/1.0/docs/ChangeLog.txt	2017-01-20 18:29:34 UTC (rev 8114)
@@ -21,7 +21,7 @@
 
 -- RUNNIX, version bump to runnix-0.4-8057, with Linux Kernel 3.2.84, dropbear 2016.74, kexec 2.0.14
 
--- php, version bump to 5.6.29
+-- php, version bump to 5.6.30
 
 -- sqlite, version bump to 3.16.2
 

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

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

From: <abe...@us...> - 2017-01-20 18:28:07

Revision: 8113
          http://sourceforge.net/p/astlinux/code/8113
Author:   abelbeck
Date:     2017-01-20 18:28:06 +0000 (Fri, 20 Jan 2017)
Log Message:
-----------
php, version bump to 5.6.30

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

Modified: branches/1.0/package/php/php.mk
===================================================================
--- branches/1.0/package/php/php.mk	2017-01-20 18:09:19 UTC (rev 8112)
+++ branches/1.0/package/php/php.mk	2017-01-20 18:28:06 UTC (rev 8113)
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-PHP_VERSION = 5.6.29
+PHP_VERSION = 5.6.30
 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.

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

From: <abe...@us...> - 2017-01-20 18:09:21

Revision: 8112
          http://sourceforge.net/p/astlinux/code/8112
Author:   abelbeck
Date:     2017-01-20 18:09:19 +0000 (Fri, 20 Jan 2017)
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	2017-01-20 17:59:48 UTC (rev 8111)
+++ branches/1.0/docs/ChangeLog.txt	2017-01-20 18:09:19 UTC (rev 8112)
@@ -85,6 +85,8 @@
 -- lighttpd, version bump to 1.4.45
    New rc.conf variable: HTTPSCHAIN, optional path to the CA file for support of chained certificates.
 
+-- ddclient, add Cloudflare dynamic DNS service support using API v4, DDSERVICE="cloudflare".
+
 -- dnscrypt-proxy, version bump to 1.9.1
 
 -- unbound (host), version bump to 1.6.0
@@ -141,7 +143,9 @@
 
 -- Firewall sub-tab, add "Log Denied attempts by a blocked host" inbound/outbound selectively.
 
+-- Network tab, add Cloudflare dynamic DNS service support.
 
+
 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:[8111] branches/1.0/package

From: <abe...@us...> - 2017-01-20 17:59:51

Revision: 8111
          http://sourceforge.net/p/astlinux/code/8111
Author:   abelbeck
Date:     2017-01-20 17:59:48 +0000 (Fri, 20 Jan 2017)
Log Message:
-----------
ddclient, add Cloudflare dynamic DNS service support

Modified Paths:
--------------
    branches/1.0/package/ddclient/ddclient.conf
    branches/1.0/package/ddclient/dynamicdns.init
    branches/1.0/package/perl/perl.mk
    branches/1.0/package/webinterface/altweb/admin/network.php

Added Paths:
-----------
    branches/1.0/package/ddclient/ddclient-21-cloudflare-ttl.patch
    branches/1.0/package/ddclient/ddclient-22-cloudflare-api-v4.patch
    branches/1.0/package/ddclient/ddclient-23-cloudflare-curl-headers.patch
    branches/1.0/package/ddclient/ddclient-24-cloudflare-JSON-PP.patch

Added: branches/1.0/package/ddclient/ddclient-21-cloudflare-ttl.patch
===================================================================
--- branches/1.0/package/ddclient/ddclient-21-cloudflare-ttl.patch	                        (rev 0)
+++ branches/1.0/package/ddclient/ddclient-21-cloudflare-ttl.patch	2017-01-20 17:59:48 UTC (rev 8111)
@@ -0,0 +1,23 @@
+diff --git a/ddclient b/ddclient
+index a39fcf0..e1e86e5 100755
+--- a/ddclient
++++ b/ddclient
+@@ -445,6 +445,7 @@ my %variables = (
+ 		'wildcard'            => setv(T_BOOL,   0, 1, 1, 0,                   undef),
+ 		'mx'	              => setv(T_OFQDN,  0, 1, 1, '',                  undef),
+ 		'backupmx'            => setv(T_BOOL,   0, 1, 1, 0,                   undef),
++		'ttl'		      => setv(T_NUMBER, 1, 0, 1, 1,                   undef),
+ 	},
+ 	'googledomains-common-defaults'       => {
+ 		'server'	      => setv(T_FQDNP,  1, 0, 1, 'domains.google.com', undef),
+@@ -4083,7 +4084,8 @@ sub nic_cloudflare_update {
+ 			}
+ 
+ 			# Set domain
+-			$url   = "https://$config{$key}{'server'}/api_json.html?a=rec_edit&type=A&ttl=1";
++			$url   = "https://$config{$key}{'server'}/api_json.html?a=rec_edit&type=A";
++			$url	 .= "&ttl=".$config{$key}{'ttl'};
+ 			$url     .= "&name=$hostname";
+ 			$url     .= "&z=".$config{$key}{'zone'};
+ 			$url     .= "&id=".$id;	
+

Added: branches/1.0/package/ddclient/ddclient-22-cloudflare-api-v4.patch
===================================================================
--- branches/1.0/package/ddclient/ddclient-22-cloudflare-api-v4.patch	                        (rev 0)
+++ branches/1.0/package/ddclient/ddclient-22-cloudflare-api-v4.patch	2017-01-20 17:59:48 UTC (rev 8111)
@@ -0,0 +1,147 @@
+--- a/ddclient	2017-01-19 11:36:50.208744563 -0600
++++ b/ddclient	2017-01-19 11:35:44.265920224 -0600
+@@ -439,7 +439,7 @@
+ 	'zone'                => setv(T_STRING, 1, 1, 1, '',                  undef),
+     },
+ 	'cloudflare-common-defaults'       => {
+-		'server'	      => setv(T_FQDNP,  1, 0, 1, 'www.cloudflare.com', undef),
++		'server'	      => setv(T_FQDNP,  1, 0, 1, 'api.cloudflare.com/client/v4', undef),
+ 		'zone'                => setv(T_FQDN,   1, 0, 1, '',                  undef),
+ 		'static'              => setv(T_BOOL,   0, 1, 1, 0,                   undef),
+ 		'wildcard'            => setv(T_BOOL,   0, 1, 1, 0,                   undef),
+@@ -613,7 +613,7 @@
+         'update'     => \&nic_cloudflare_update,
+         'examples'   => \&nic_cloudflare_examples,
+         'variables'  => merge(
+-            { 'server'       => setv(T_FQDNP,  1, 0, 1, 'www.cloudflare.com', undef)          },
++            { 'server'       => setv(T_FQDNP,  1, 0, 1, 'api.cloudflare.com/client/v4', undef) },
+             { 'min-interval' => setv(T_DELAY,  0, 0, 1, interval('5m'), 0),},
+             $variables{'cloudflare-common-defaults'},
+             $variables{'service-common-defaults'},
+@@ -1894,6 +1894,9 @@
+     my $url      = shift || '';
+     my $login    = shift || '';
+     my $password = shift || '';
++    my $headers  = shift || '';
++    my $method   = shift || 'GET';
++    my $data     = shift || '';
+     my ($peer, $server, $port, $default_port, $use_ssl);
+     my ($sd, $rq, $request, $reply);
+ 
+@@ -1934,7 +1937,7 @@
+     my $to =  sprintf "%s%s", $server, $proxy ? " via proxy $peer:$port" : "";
+     verbose("CONNECT:", "%s", $to);
+ 
+-    $request  = "GET ";
++    $request  = "$method ";
+     $request .= "http://$server" if $proxy;
+     $request .= "/$url HTTP/1.0\n";
+     $request .= "Host: $server\n";
+@@ -1943,7 +1946,10 @@
+     $request .= "Authorization: Basic $auth\n" if $login || $password;
+     $request .= "User-Agent: ${program}/${version}\n";
+     $request .= "Connection: close\n";
++    $request .= "$headers\n";
++    $request .= "Content-Length: ".length($data)."\n" if $data;
+     $request .= "\n";
++    $request .= $data;
+ 
+     ## make sure newlines are <cr><lf> for some pedantic proxy servers
+     ($rq = $request) =~ s/\n/\r\n/g;
+@@ -4010,7 +4016,7 @@
+ 
+ Configuration variables applicable to the 'cloudflare' protocol are:
+   protocol=cloudflare          ## 
+-  server=fqdn.of.service       ## defaults to www.cloudflare.com
++  server=fqdn.of.service       ## defaults to api.cloudflare.com/client/v4
+   login=service-login          ## login name and password  registered with the service
+   password=service-password    ##
+   fully.qualified.host         ## the host registered with the service.
+@@ -4047,6 +4053,10 @@
+ 		my $key   = $hosts[0];
+ 		my $ip    = $config{$key}{'wantip'};
+ 
++		my $headers = "X-Auth-Email: $config{$key}{'login'}\n";
++		$headers .= "X-Auth-Key: $config{$key}{'password'}\n";
++		$headers .= "Content-Type: application/json";
++
+ 		# FQDNs
+ 		for my $domain (@hosts) {
+ 			(my $hostname = $domain) =~ s/\.$config{$key}{zone}$//;
+@@ -4055,13 +4065,11 @@
+ 			info("setting IP address to %s for %s", $ip, $domain);
+ 			verbose("UPDATE:","updating %s", $domain);
+ 
+-			# Get domain ID
+-			my $url = "https://$config{$key}{'server'}/api_json.html?a=rec_load_all";
+-			$url   .= "&z=".$config{$key}{'zone'};
+-			$url   .= "&email=".$config{$key}{'login'};	
+-			$url   .= "&tkn=".$config{$key}{'password'};
++			# Get zone ID
++			my $url = "https://$config{$key}{'server'}/zones?";
++			$url   .= "name=".$config{$key}{'zone'};
+ 
+-			my $reply = geturl(opt('proxy'), $url);
++			my $reply = geturl(opt('proxy'), $url, undef, undef, $headers);
+ 			unless ($reply) {
+ 				failed("updating %s: Could not connect to %s.", $domain, $config{$key}{'server'});
+ 				last;
+@@ -4077,24 +4085,44 @@
+ 			}
+ 
+ 			# Pull the ID out of the json, messy
+-			my ($id) = map { $_->{name} eq $domain ? $_->{rec_id} : () } @{ $response->{response}->{recs}->{objs} };
+-			unless($id) {
+-				failed("updating %s: No domain ID found.", $domain);
++			my ($zone_id) = map { $_->{name} eq $config{$key}{'zone'} ? $_->{id} : () } @{ $response->{result} };
++			unless($zone_id) {
++				failed("updating %s: No zone ID found.", $config{$key}{'zone'});
+ 				next;
+ 			}
++			info("zone ID is $zone_id");
+ 
+-			# Set domain
+-			$url   = "https://$config{$key}{'server'}/api_json.html?a=rec_edit&type=A";
+-			$url	 .= "&ttl=".$config{$key}{'ttl'};
+-			$url     .= "&name=$hostname";
+-			$url     .= "&z=".$config{$key}{'zone'};
+-			$url     .= "&id=".$id;	
+-			$url     .= "&email=".$config{$key}{'login'};	
+-			$url     .= "&tkn=".$config{$key}{'password'};    
+-			$url     .= "&content=";
+-			$url     .= "$ip"       if $ip;
++			# Get DNS record ID
++			$url = "https://$config{$key}{'server'}/zones/$zone_id/dns_records?";
++			$url .= "type=A&name=$domain";
++
++			$reply = geturl(opt('proxy'), $url, undef, undef, $headers);
++			unless ($reply) {
++				failed("updating %s: Could not connect to %s.", $domain, $config{$key}{'server'});
++				last;
++			}
++			last if !header_ok($domain, $reply);
++
++			# Strip header
++			$reply =~ s/^.*?\n\n//s;
++			$response = JSON::Any->jsonToObj($reply);
++			if ($response->{result} eq 'error') {
++				failed ("%s", $response->{msg});
++				next; 
++			}
+ 
+-			$reply = geturl(opt('proxy'), $url);
++			# Pull the ID out of the json, messy
++			my ($dns_rec_id) = map { $_->{name} eq $domain ? $_->{id} : () } @{ $response->{result} };
++			unless($dns_rec_id) {
++				failed("updating %s: No DNS record ID found.", $domain);
++				next;
++			}
++			info("DNS record ID is $dns_rec_id");
++
++			# Set domain
++			$url   = "https://$config{$key}{'server'}/zones/$zone_id/dns_records/$dns_rec_id";
++			my $data = "{\"content\":\"$ip\"}";
++			$reply = geturl(opt('proxy'), $url, undef, undef, $headers, "PATCH", $data);
+ 			unless ($reply) {
+ 				failed("updating %s: Could not connect to %s.", $domain, $config{$domain}{'server'});
+ 				last;

Added: branches/1.0/package/ddclient/ddclient-23-cloudflare-curl-headers.patch
===================================================================
--- branches/1.0/package/ddclient/ddclient-23-cloudflare-curl-headers.patch	                        (rev 0)
+++ branches/1.0/package/ddclient/ddclient-23-cloudflare-curl-headers.patch	2017-01-20 17:59:48 UTC (rev 8111)
@@ -0,0 +1,29 @@
+--- a/ddclient
++++ b/ddclient
+@@ -1959,6 +1959,26 @@
+     if (! opt('exec')) {
+ 	debug("skipped network connection");
+ 	verbose("SENDING:", "%s", $request);
++    } elsif (($headers ne '')) {
++        $0 = sprintf("%s - curl (SSL w/headers) sending to %s port %s", $program, $peer, $port);
++        my $timeout = opt('timeout');
++        my @head_lines = split('\n', $headers);
++        my $head_args = '';
++        foreach my $head_line (@head_lines) {
++          $head_args .= "-H '$head_line' ";
++        }
++
++        $reply = <<`CURL_SSL_HEADERS`;
++/usr/bin/curl -si0 -X $method --user-agent '${program}/${version}' \\
++              --connect-timeout $timeout --max-time $timeout \\
++              ${head_args} \\
++              --data '${data}' \\
++              --url 'https://${server}/${url}' 2>/dev/null
++CURL_SSL_HEADERS
++
++        if (! $reply) {
++            warning("curl (SSL w/headers) cannot connect to $peer:$port");
++        }
+     } elsif ($use_ssl) {
+         $0 = sprintf("%s - curl (SSL) sending to %s port %s", $program, $peer, $port);
+         my $timeout = opt('timeout');

Added: branches/1.0/package/ddclient/ddclient-24-cloudflare-JSON-PP.patch
===================================================================
--- branches/1.0/package/ddclient/ddclient-24-cloudflare-JSON-PP.patch	                        (rev 0)
+++ branches/1.0/package/ddclient/ddclient-24-cloudflare-JSON-PP.patch	2017-01-20 17:59:48 UTC (rev 8111)
@@ -0,0 +1,58 @@
+--- a/ddclient	2017-01-20 09:04:33.026792149 -0600
++++ b/ddclient	2017-01-20 09:06:01.478773577 -0600
+@@ -1878,13 +1878,13 @@
+ ## load_json_support
+ ######################################################################
+ sub load_json_support {
+-	my $json_loaded = eval {require JSON::Any};
++	my $json_loaded = eval {require JSON::PP};
+ 	unless ($json_loaded) {
+ 		fatal(<<"EOM");
+-Error loading the Perl module JSON::Any needed for cloudflare update.
++Error loading the Perl module JSON::PP needed for cloudflare update.
+ EOM
+ 	}
+-	import JSON::Any;
++	import JSON::PP (qw/decode_json/);
+ }
+ ######################################################################
+ ## geturl
+@@ -4098,9 +4098,9 @@
+ 
+ 			# Strip header
+ 			$reply =~ s/^.*?\n\n//s;
+-			my $response = JSON::Any->jsonToObj($reply);
+-			if ($response->{result} eq 'error') {
+-				failed ("%s", $response->{msg});
++			my $response = eval {decode_json($reply)};
++ 			if (!defined $response || !defined $response->{result}) {
++				failed ("invalid json or result.");
+ 				next; 
+ 			}
+ 
+@@ -4125,9 +4125,9 @@
+ 
+ 			# Strip header
+ 			$reply =~ s/^.*?\n\n//s;
+-			$response = JSON::Any->jsonToObj($reply);
+-			if ($response->{result} eq 'error') {
+-				failed ("%s", $response->{msg});
++			$response = eval {decode_json($reply)};
++			if (!defined $response || !defined $response->{result}) {
++				failed ("invalid json or result.");
+ 				next; 
+ 			}
+ 
+@@ -4151,9 +4151,9 @@
+ 
+ 			# Strip header
+ 			$reply =~ s/^.*?\n\n//s;
+-			$response = JSON::Any->jsonToObj($reply);
+-			if ($response->{result} eq 'error') {
+-				failed ("%s", $response->{msg});	
++			$response = eval {decode_json($reply)};
++			if (!defined $response || !defined $response->{result}) {
++				failed ("invalid json or result.");
+ 			} else {
+ 				success ("%s -- Updated Successfully to %s", $domain, $ip);
+ 

Modified: branches/1.0/package/ddclient/ddclient.conf
===================================================================
--- branches/1.0/package/ddclient/ddclient.conf	2017-01-19 14:08:32 UTC (rev 8110)
+++ branches/1.0/package/ddclient/ddclient.conf	2017-01-20 17:59:48 UTC (rev 8111)
@@ -113,4 +113,12 @@
 #@dtdns@>client=ddclient
 #@dtdns@>password=@DDPASS@
 #@dtdns@>@DDHOST@
+#@cloudflare@>
+#@cloudflare@>## Cloudflare
+#@cloudflare@>ssl=yes
+#@cloudflare@>protocol=cloudflare
+#@cloudflare@>zone=@DOMAIN@
+#@cloudflare@>login=@DDUSER@
+#@cloudflare@>password=@DDPASS@
+#@cloudflare@>@DDHOST@
 

Modified: branches/1.0/package/ddclient/dynamicdns.init
===================================================================
--- branches/1.0/package/ddclient/dynamicdns.init	2017-01-19 14:08:32 UTC (rev 8110)
+++ branches/1.0/package/ddclient/dynamicdns.init	2017-01-20 17:59:48 UTC (rev 8111)
@@ -4,7 +4,7 @@
 
 gen_ddclient_conf()
 {
-  local use_web="" use_if="#" web_str delay service
+  local use_web="" use_if="#" web_str delay domain service
 
   if [ ! -x /usr/sbin/ddclient ]; then
     echo "dynamicdns: Script \"/usr/sbin/ddclient\" not found, exiting." >&2
@@ -26,6 +26,9 @@
     web_str="$DDGETIP/"
   fi
 
+  # extract the root domain of DDHOST, used by some providers like Cloudflare
+  domain="$(echo $DDHOST | sed -n -r -e 's/^(.*\.|)([^.]+)\.([^.]+)$/\2.\3/p')"
+
   # Handle Service Types
   case "$DDSERVICE" in
     'de...@zo...') service="zoneedit" ;;
@@ -61,6 +64,7 @@
     sed -i -e "s|@DDUSER@|${DDUSER}|g" \
            -e "s|@DDPASS@|${DDPASS}|g" \
            -e "s|@DDHOST@|${DDHOST}|g" \
+           -e "s|@DOMAIN@|${domain}|g" \
            -e "s|@EXTIF@|${EXTIF}|g" \
            -e "s|@EXT2IF@|${EXT2IF}|g" \
            -e "s|@DELAY@|${delay}|g" \

Modified: branches/1.0/package/perl/perl.mk
===================================================================
--- branches/1.0/package/perl/perl.mk	2017-01-19 14:08:32 UTC (rev 8110)
+++ branches/1.0/package/perl/perl.mk	2017-01-20 17:59:48 UTC (rev 8111)
@@ -14,7 +14,7 @@
 
 PERL_ARCHNAME = $(ARCH)-linux
 
-PERL_MODULES = constant version Carp Errno Fcntl PathTools POSIX Digest Socket IO XSLoader Exporter File-Find
+PERL_MODULES = constant version Carp Errno Fcntl PathTools POSIX Digest Socket IO XSLoader Exporter B File-Find JSON-PP
 PERL_MODULES += Digest/MD5 Digest/SHA Getopt/Long Time/Local File/Glob Sys/Hostname
 
 PERL_CROSS_VERSION = 1.0.3

Modified: branches/1.0/package/webinterface/altweb/admin/network.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/network.php	2017-01-19 14:08:32 UTC (rev 8110)
+++ branches/1.0/package/webinterface/altweb/admin/network.php	2017-01-20 17:59:48 UTC (rev 8111)
@@ -86,6 +86,7 @@
 $select_dyndns = array (
   'User Defined&nbsp;&nbsp;&nbsp;&gt;&gt;&gt;' => '',
   'ChangeIP' => 'changeip',
+  'Cloudflare' => 'cloudflare',
   'DNS-O-Matic' => 'de...@dn...',
   'DNS Park' => 'dnspark',
   'DtDNS' => 'dtdns',

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

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

From: <abe...@us...> - 2017-01-19 14:08:34

Revision: 8110
          http://sourceforge.net/p/astlinux/code/8110
Author:   abelbeck
Date:     2017-01-19 14:08:32 +0000 (Thu, 19 Jan 2017)
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	2017-01-19 14:05:44 UTC (rev 8109)
+++ branches/1.0/docs/ChangeLog.txt	2017-01-19 14:08:32 UTC (rev 8110)
@@ -56,7 +56,7 @@
 
 -- reload-blocklist-netset (optional CRON script), add 'firehol_webclient' blocklist support.
 
--- ca-certificates, update trusted root certificates 2016-11-02
+-- ca-certificates, update trusted root certificates 2017-01-18
 
 -- Time Zone Database update, tzdata2016j and php-timezonedb-2016.10
 

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

[Astlinux-commits] SF.net SVN: astlinux:[8109] branches/1.0/package/ca-certificates/ ca-certificates.mk

From: <abe...@us...> - 2017-01-19 14:05:46

Revision: 8109
          http://sourceforge.net/p/astlinux/code/8109
Author:   abelbeck
Date:     2017-01-19 14:05:44 +0000 (Thu, 19 Jan 2017)
Log Message:
-----------
ca-certificates, version bump to 2017-01-18

Modified Paths:
--------------
    branches/1.0/package/ca-certificates/ca-certificates.mk

Modified: branches/1.0/package/ca-certificates/ca-certificates.mk
===================================================================
--- branches/1.0/package/ca-certificates/ca-certificates.mk	2017-01-16 16:15:35 UTC (rev 8108)
+++ branches/1.0/package/ca-certificates/ca-certificates.mk	2017-01-19 14:05:44 UTC (rev 8109)
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-CA_CERTIFICATES_VERSION = 2016-11-02
+CA_CERTIFICATES_VERSION = 2017-01-18
 CA_CERTIFICATES_SOURCE = cacert-$(CA_CERTIFICATES_VERSION).pem
 CA_CERTIFICATES_SITE = https://curl.haxx.se/ca
 

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

[Astlinux-commits] SF.net SVN: astlinux:[8108] branches/1.0/package/acme

From: <abe...@us...> - 2017-01-16 16:15:37

Revision: 8108
          http://sourceforge.net/p/astlinux/code/8108
Author:   abelbeck
Date:     2017-01-16 16:15:35 +0000 (Mon, 16 Jan 2017)
Log Message:
-----------
acme, version bump to official release 2.6.5

Modified Paths:
--------------
    branches/1.0/package/acme/acme-client.sh
    branches/1.0/package/acme/acme.mk

Modified: branches/1.0/package/acme/acme-client.sh
===================================================================
--- branches/1.0/package/acme/acme-client.sh	2017-01-16 14:33:46 UTC (rev 8107)
+++ branches/1.0/package/acme/acme-client.sh	2017-01-16 16:15:35 UTC (rev 8108)
@@ -86,9 +86,9 @@
   for arg in $*; do
     skip=0
     case "$arg" in
-      --installcronjob)
+      --installcronjob|--install-cronjob)
         add_cron_entry ; skip=1 ;;
-      --uninstallcronjob)
+      --uninstallcronjob|--uninstall-cronjob)
         del_cron_entry ; skip=1 ;;
       --install)
         no_op_arg "$arg" ; skip=1 ;;

Modified: branches/1.0/package/acme/acme.mk
===================================================================
--- branches/1.0/package/acme/acme.mk	2017-01-16 14:33:46 UTC (rev 8107)
+++ branches/1.0/package/acme/acme.mk	2017-01-16 16:15:35 UTC (rev 8108)
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-ACME_VERSION = 2.6.5-2017-01-13
+ACME_VERSION = 2.6.5
 ACME_SOURCE = acme.sh-$(ACME_VERSION).tar.gz
 ACME_SITE = http://files.astlinux-project.org
 

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

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

From: <abe...@us...> - 2017-01-16 14:33:48

Revision: 8107
          http://sourceforge.net/p/astlinux/code/8107
Author:   abelbeck
Date:     2017-01-16 14:33:46 +0000 (Mon, 16 Jan 2017)
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	2017-01-16 14:32:59 UTC (rev 8106)
+++ branches/1.0/docs/ChangeLog.txt	2017-01-16 14:33:46 UTC (rev 8107)
@@ -40,7 +40,7 @@
 -- 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
 
--- zlib, version bump to 1.2.10
+-- zlib, version bump to 1.2.11
 
 -- lzo, version bump to 2.09
 

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

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

From: <abe...@us...> - 2017-01-16 14:33:02

Revision: 8106
          http://sourceforge.net/p/astlinux/code/8106
Author:   abelbeck
Date:     2017-01-16 14:32:59 +0000 (Mon, 16 Jan 2017)
Log Message:
-----------
zlib, version bump to 1.2.11

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

Modified: branches/1.0/package/zlib/zlib.mk
===================================================================
--- branches/1.0/package/zlib/zlib.mk	2017-01-16 14:21:59 UTC (rev 8105)
+++ branches/1.0/package/zlib/zlib.mk	2017-01-16 14:32:59 UTC (rev 8106)
@@ -3,7 +3,7 @@
 # zlib
 #
 #############################################################
-ZLIB_VERSION = 1.2.10
+ZLIB_VERSION = 1.2.11
 ZLIB_SOURCE = zlib-$(ZLIB_VERSION).tar.gz
 ZLIB_SITE = http://downloads.sourceforge.net/project/libpng/zlib/$(ZLIB_VERSION)
 ZLIB_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:[8105] branches/1.0/docs/ChangeLog.txt

From: <abe...@us...> - 2017-01-16 14:22:02

Revision: 8105
          http://sourceforge.net/p/astlinux/code/8105
Author:   abelbeck
Date:     2017-01-16 14:21:59 +0000 (Mon, 16 Jan 2017)
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	2017-01-16 14:20:26 UTC (rev 8104)
+++ branches/1.0/docs/ChangeLog.txt	2017-01-16 14:21:59 UTC (rev 8105)
@@ -71,7 +71,7 @@
    New rc.conf variables are: IPSEC_ALLOWED_ENDPOINTS and IPSEC_ALLOWED_VPN_NETS
    More info: http://doc.astlinux-project.org/userdoc:tt_ipsec_vpn_strongswan
 
--- chrony, version 3.0-pre3, new package to replace 'ntpd' as the NTP daemon, NTPv4 client and server.
+-- chrony, version 3.0, 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-project.org/userdoc:tt_ntp_client_server

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

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

From: <abe...@us...> - 2017-01-16 14:20:28

Revision: 8104
          http://sourceforge.net/p/astlinux/code/8104
Author:   abelbeck
Date:     2017-01-16 14:20:26 +0000 (Mon, 16 Jan 2017)
Log Message:
-----------
chrony, version bump to 3.0

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

Modified: branches/1.0/package/chrony/chrony.mk
===================================================================
--- branches/1.0/package/chrony/chrony.mk	2017-01-15 23:33:58 UTC (rev 8103)
+++ branches/1.0/package/chrony/chrony.mk	2017-01-16 14:20:26 UTC (rev 8104)
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-CHRONY_VERSION = 3.0-pre3
+CHRONY_VERSION = 3.0
 CHRONY_SITE = http://download.tuxfamily.org/chrony
 CHRONY_DEPENDENCIES = libcap
 

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

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

From: <abe...@us...> - 2017-01-15 23:34:00

Revision: 8103
          http://sourceforge.net/p/astlinux/code/8103
Author:   abelbeck
Date:     2017-01-15 23:33:58 +0000 (Sun, 15 Jan 2017)
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	2017-01-15 23:32:50 UTC (rev 8102)
+++ branches/1.0/docs/ChangeLog.txt	2017-01-15 23:33:58 UTC (rev 8103)
@@ -52,7 +52,7 @@
 
 -- strace, version bump to 4.15
 
--- sudo, version bump to 1.8.19p1
+-- sudo, version bump to 1.8.19p2
 
 -- 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:[8102] branches/1.0/package/sudo/sudo.mk

From: <abe...@us...> - 2017-01-15 23:32:52

Revision: 8102
          http://sourceforge.net/p/astlinux/code/8102
Author:   abelbeck
Date:     2017-01-15 23:32:50 +0000 (Sun, 15 Jan 2017)
Log Message:
-----------
sudo, version bump to 1.8.19p2

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

Modified: branches/1.0/package/sudo/sudo.mk
===================================================================
--- branches/1.0/package/sudo/sudo.mk	2017-01-15 21:34:44 UTC (rev 8101)
+++ branches/1.0/package/sudo/sudo.mk	2017-01-15 23:32:50 UTC (rev 8102)
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-SUDO_VERSION = 1.8.19p1
+SUDO_VERSION = 1.8.19p2
 SUDO_SITE = http://www.sudo.ws/sudo/dist
 
 # This is to avoid sudo's make install from chown()ing files which fails

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

[Astlinux-commits] SF.net SVN: astlinux:[8101] branches/1.0/package/acme/astlinux.sh

From: <abe...@us...> - 2017-01-15 21:34:46

Revision: 8101
          http://sourceforge.net/p/astlinux/code/8101
Author:   abelbeck
Date:     2017-01-15 21:34:44 +0000 (Sun, 15 Jan 2017)
Log Message:
-----------
acme, astlinux.sh deploy, add prosody support (untested)

Modified Paths:
--------------
    branches/1.0/package/acme/astlinux.sh

Modified: branches/1.0/package/acme/astlinux.sh
===================================================================
--- branches/1.0/package/acme/astlinux.sh	2017-01-15 21:01:17 UTC (rev 8100)
+++ branches/1.0/package/acme/astlinux.sh	2017-01-15 21:34:44 UTC (rev 8101)
@@ -72,5 +72,22 @@
     logger -s -t acme-client "New ACME certificates deployed for SIP-TLS and Asterisk restart when convenient requested"
   fi
 
+  if astlinux_is_acme_service prosody; then
+    service prosody stop
+    mkdir -p /mnt/kd/prosody/certs
+    if [ -f "$_cfullchain" ]; then
+      cat "$_cfullchain" > /mnt/kd/prosody/certs/server.crt
+    else
+      cat "$_ccert" > /mnt/kd/prosody/certs/server.crt
+    fi
+    cat "$_ckey" > /mnt/kd/prosody/certs/server.key
+    chmod 600 /mnt/kd/prosody/certs/server.key
+    chown prosody:prosody /mnt/kd/prosody/certs/server.crt
+    chown prosody:prosody /mnt/kd/prosody/certs/server.key
+    sleep 1
+    service prosody init
+    logger -s -t acme-client "New ACME certificates deployed for XMPP and Prosody restarted"
+  fi
+
   return 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:[8100] branches/1.0/package/acme/astlinux.sh

From: <abe...@us...> - 2017-01-15 21:01:18

Revision: 8100
          http://sourceforge.net/p/astlinux/code/8100
Author:   abelbeck
Date:     2017-01-15 21:01:17 +0000 (Sun, 15 Jan 2017)
Log Message:
-----------
acme, astlinux.sh deploy now uses ACME_SERVICE rc.conf variable

Modified Paths:
--------------
    branches/1.0/package/acme/astlinux.sh

Modified: branches/1.0/package/acme/astlinux.sh
===================================================================
--- branches/1.0/package/acme/astlinux.sh	2017-01-15 17:15:08 UTC (rev 8099)
+++ branches/1.0/package/acme/astlinux.sh	2017-01-15 21:01:17 UTC (rev 8100)
@@ -8,6 +8,21 @@
 
 . /etc/rc.conf
 
+#service_type
+astlinux_is_acme_service()
+{
+  local service IFS
+
+  unset IFS
+  for service in $ACME_SERVICE; do
+    if [ "$service" = "$1" ]; then
+      return 0
+    fi
+  done
+
+  return 1
+}
+
 ########  Public functions #####################
 
 #domain keyfile certfile cafile fullchain
@@ -24,23 +39,27 @@
   _debug _cca "$_cca"
   _debug _cfullchain "$_cfullchain"
 
-  if [ -n "$HTTPSCERT" -a "$HTTPS_ACME" = "yes" ]; then
-    service lighttpd stop
-    cat "$_ckey" "$_ccert" > "$HTTPSCERT"
-    chmod 600 "$HTTPSCERT"
-    if [ -n "$HTTPSCHAIN" ]; then
-      if [ -f "$_cfullchain" ]; then
-        cat "$_cfullchain" > "$HTTPSCHAIN"
-      else
-        rm -f "$HTTPSCHAIN"
+  if astlinux_is_acme_service lighttpd; then
+    if [ -z "$HTTPSCERT" ]; then
+      logger -s -t acme-client "Failed to deploy ACME certificates HTTPS, invalid HTTPSCERT path"
+    else
+      service lighttpd stop
+      cat "$_ckey" "$_ccert" > "$HTTPSCERT"
+      chmod 600 "$HTTPSCERT"
+      if [ -n "$HTTPSCHAIN" ]; then
+        if [ -f "$_cfullchain" ]; then
+          cat "$_cfullchain" > "$HTTPSCHAIN"
+        else
+          rm -f "$HTTPSCHAIN"
+        fi
       fi
+      sleep 1
+      service lighttpd init
+      logger -s -t acme-client "New ACME certificates deployed for HTTPS and Lighttpd restarted"
     fi
-    sleep 1
-    service lighttpd init
-    logger -s -t acme-client "New ACME certificates deployed for HTTPS and Lighttpd restarted"
   fi
 
-  if [ "$SIPTLSCERT_ACME" = "yes" ]; then
+  if astlinux_is_acme_service asterisk; then
     mkdir -p /mnt/kd/ssl/sip-tls/keys
     if [ -f "$_cfullchain" ]; then
       cat "$_cfullchain" > /mnt/kd/ssl/sip-tls/keys/server.crt

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

[Astlinux-commits] SF.net SVN: astlinux:[8099] branches/1.0/package/acme/astlinux.sh

From: <abe...@us...> - 2017-01-15 17:15:11

Revision: 8099
          http://sourceforge.net/p/astlinux/code/8099
Author:   abelbeck
Date:     2017-01-15 17:15:08 +0000 (Sun, 15 Jan 2017)
Log Message:
-----------
acme, astlinux.sh, simplify logger messages by removing bash'isms

Modified Paths:
--------------
    branches/1.0/package/acme/astlinux.sh

Modified: branches/1.0/package/acme/astlinux.sh
===================================================================
--- branches/1.0/package/acme/astlinux.sh	2017-01-15 16:32:01 UTC (rev 8098)
+++ branches/1.0/package/acme/astlinux.sh	2017-01-15 17:15:08 UTC (rev 8099)
@@ -37,7 +37,7 @@
     fi
     sleep 1
     service lighttpd init
-    logger -s -t ${0##*/}[$$] "${BASH_SOURCE##*/}:$LINENO New ACME certificates deployed for HTTPS and Lighttpd restarted"
+    logger -s -t acme-client "New ACME certificates deployed for HTTPS and Lighttpd restarted"
   fi
 
   if [ "$SIPTLSCERT_ACME" = "yes" ]; then
@@ -50,7 +50,7 @@
     cat "$_ckey" > /mnt/kd/ssl/sip-tls/keys/server.key
     chmod 600 /mnt/kd/ssl/sip-tls/keys/server.key
     asterisk -rx "core restart when convenient" >/dev/null 2>&1 &
-    logger -s -t ${0##*/}[$$] "${BASH_SOURCE##*/}:$LINENO New ACME certificates deployed for SIP-TLS and Asterisk restart when convenient requested"
+    logger -s -t acme-client "New ACME certificates deployed for SIP-TLS and Asterisk restart when convenient requested"
   fi
 
   return 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:[8098] branches/1.0/package/acme/astlinux.sh

From: <abe...@us...> - 2017-01-15 16:32:03

Revision: 8098
          http://sourceforge.net/p/astlinux/code/8098
Author:   abelbeck
Date:     2017-01-15 16:32:01 +0000 (Sun, 15 Jan 2017)
Log Message:
-----------
acme, astlinux.sh changes by David Kerr

Modified Paths:
--------------
    branches/1.0/package/acme/astlinux.sh

Modified: branches/1.0/package/acme/astlinux.sh
===================================================================
--- branches/1.0/package/acme/astlinux.sh	2017-01-15 16:16:59 UTC (rev 8097)
+++ branches/1.0/package/acme/astlinux.sh	2017-01-15 16:32:01 UTC (rev 8098)
@@ -37,20 +37,20 @@
     fi
     sleep 1
     service lighttpd init
+    logger -s -t ${0##*/}[$$] "${BASH_SOURCE##*/}:$LINENO New ACME certificates deployed for HTTPS and Lighttpd restarted"
   fi
 
   if [ "$SIPTLSCERT_ACME" = "yes" ]; then
-# TODO.  Not sure what the right files to use are. Need to test.
-# See..
-# https://web.johncook.uk/articles/computing/lets-encrypt-launch
-# https://www.jedwarddurrett.com/20160604162607.php
-
     mkdir -p /mnt/kd/ssl/sip-tls/keys
-    cat "$_cfullchain" > /mnt/kd/ssl/sip-tls/keys/server.crt
+    if [ -f "$_cfullchain" ]; then
+      cat "$_cfullchain" > /mnt/kd/ssl/sip-tls/keys/server.crt
+    else
+      cat "$_ccert" > /mnt/kd/ssl/sip-tls/keys/server.crt
+    fi
     cat "$_ckey" > /mnt/kd/ssl/sip-tls/keys/server.key
     chmod 600 /mnt/kd/ssl/sip-tls/keys/server.key
-# How to tell Asterisk to reload certificate?
-# Hopefully just a reload (of just SIP or PJSIP?) and not a restart
+    asterisk -rx "core restart when convenient" >/dev/null 2>&1 &
+    logger -s -t ${0##*/}[$$] "${BASH_SOURCE##*/}:$LINENO New ACME certificates deployed for SIP-TLS and Asterisk restart when convenient requested"
   fi
 
   return 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:[8097] branches/1.0/package/acme/acme-client.sh

From: <abe...@us...> - 2017-01-15 16:17:01

Revision: 8097
          http://sourceforge.net/p/astlinux/code/8097
Author:   abelbeck
Date:     2017-01-15 16:16:59 +0000 (Sun, 15 Jan 2017)
Log Message:
-----------
acme, acme-client, add native support for --installcronjob and --uninstallcronjob

Modified Paths:
--------------
    branches/1.0/package/acme/acme-client.sh

Modified: branches/1.0/package/acme/acme-client.sh
===================================================================
--- branches/1.0/package/acme/acme-client.sh	2017-01-15 01:34:33 UTC (rev 8096)
+++ branches/1.0/package/acme/acme-client.sh	2017-01-15 16:16:59 UTC (rev 8097)
@@ -25,14 +25,52 @@
   exit 1
 fi
 
+CRON_FILE="/var/spool/cron/crontabs/root"
+
+CRON_UPDATE="/var/spool/cron/crontabs/cron.update"
+
+is_cron_entry()
+{
+  grep -q '/usr/sbin/acme-client ' "$CRON_FILE"
+}
+
 add_cron_entry()
 {
-  echo "acme-client: TODO installcronjob."
+  local min
+
+  if is_cron_entry; then
+    echo "acme-client: cron entry previously exists, no changes."
+    return
+  fi
+
+  # randomize minutes in the range of 4-56, 53 is a prime number
+  min=$(( RANDOM % 53 + 4 ))
+
+  echo "$min 1 * * * /usr/sbin/acme-client --cron >/dev/null 2>&1" >> "$CRON_FILE"
+  echo 'root' >> "$CRON_UPDATE"
+
+  if is_cron_entry; then
+    echo "acme-client: Successfully added cron entry."
+  else
+    echo "acme-client: Failed adding cron entry."
+  fi
 }
 
 del_cron_entry()
 {
-  echo "acme-client: TODO uninstallcronjob."
+  if ! is_cron_entry; then
+    echo "acme-client: cron entry does not exist, no changes."
+    return
+  fi
+
+  sed -i -e '/\/usr\/sbin\/acme-client /d' "$CRON_FILE"
+  echo 'root' >> "$CRON_UPDATE"
+
+  if ! is_cron_entry; then
+    echo "acme-client: Successfully removed cron entry."
+  else
+    echo "acme-client: Failed removing cron entry."
+  fi
 }
 
 no_op_arg()

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

[Astlinux-commits] SF.net SVN: astlinux:[8096] branches/1.0/package/acme/acme-client.sh

From: <abe...@us...> - 2017-01-15 01:34:35

Revision: 8096
          http://sourceforge.net/p/astlinux/code/8096
Author:   abelbeck
Date:     2017-01-15 01:34:33 +0000 (Sun, 15 Jan 2017)
Log Message:
-----------
acme, acme-client command, natively handle some options

Modified Paths:
--------------
    branches/1.0/package/acme/acme-client.sh

Modified: branches/1.0/package/acme/acme-client.sh
===================================================================
--- branches/1.0/package/acme/acme-client.sh	2017-01-14 22:29:31 UTC (rev 8095)
+++ branches/1.0/package/acme/acme-client.sh	2017-01-15 01:34:33 UTC (rev 8096)
@@ -25,12 +25,50 @@
   exit 1
 fi
 
-# Robust 'bash' method of creating/testing for a lockfile
-if ! ( set -o noclobber; echo "$$" > "$LOCKFILE" ) 2>/dev/null; then
-  echo "acme-client: already running, lockfile \"$LOCKFILE\" exists, process id: $(cat "$LOCKFILE")." >&2
-  exit 9
-fi
+add_cron_entry()
+{
+  echo "acme-client: TODO installcronjob."
+}
 
+del_cron_entry()
+{
+  echo "acme-client: TODO uninstallcronjob."
+}
+
+no_op_arg()
+{
+  echo "acme-client: The $1 option has been disabled."
+}
+
+special_arg_handler()
+{
+  local arg skip IFS
+
+  IFS='~'  # expand command-line args using the unique 'tilde' character
+  for arg in $*; do
+    skip=0
+    case "$arg" in
+      --installcronjob)
+        add_cron_entry ; skip=1 ;;
+      --uninstallcronjob)
+        del_cron_entry ; skip=1 ;;
+      --install)
+        no_op_arg "$arg" ; skip=1 ;;
+      --uninstall)
+        no_op_arg "$arg" ; skip=1 ;;
+      --upgrade)
+        no_op_arg "$arg" ; skip=1 ;;
+      --auto-upgrade)
+        no_op_arg "$arg" ; skip=1 ;;
+    esac
+    if [ $skip -eq 1 ]; then
+      return 0
+    fi
+  done
+
+  return 1
+}
+
 add_account_opts()
 {
   local file="$1" line opt value IFS
@@ -49,6 +87,16 @@
   done
 }
 
+if special_arg_handler "$@"; then
+  exit 0
+fi
+
+# Robust 'bash' method of creating/testing for a lockfile
+if ! ( set -o noclobber; echo "$$" > "$LOCKFILE" ) 2>/dev/null; then
+  echo "acme-client: already running, lockfile \"$LOCKFILE\" exists, process id: $(cat "$LOCKFILE")." >&2
+  exit 9
+fi
+
 accountemail="$ACME_ACCOUNT_EMAIL"
 
 # Extract from possible <a@b.tld> format

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 .. 11 12 13 14 15 .. 329 > >> (Page 13 of 329)