[prev in list] [next in list] [prev in thread] [next in thread]
List: ipfire-scm
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. e3b5a052ecd0eb5c53f669c5218f360b
From: git () ipfire ! org (Michael Tremer)
Date: 2014-05-17 13:33:26
Message-ID: 20140517133326.D2A3B21003 () argus ! ipfire ! org
[Download RAW message or body]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via e3b5a052ecd0eb5c53f669c5218f360b016fe128 (commit)
via 53ac77f61004852ad7a593e0a4441619aaecd300 (commit)
via ace810a3f85f58a59c4ca430b61d052817e7362c (commit)
via cf6abf539ed973c6bb053293cafeee01e60ac0d1 (commit)
via 080568824d60c86189a49d272a390f81c86a0eba (commit)
via 5a9f40613eea53a15e3cf6dc6348114329871ac3 (commit)
via f353972f3f84da9873f0512dc8810a20408fde2c (commit)
via edb7235c38554f9a02a03cd1b58f027cae43cf8c (commit)
via 9cf34ad1ed74f88a139e620fff476e6ae0a9707f (commit)
via b1ab4a4dd0cce83c838b9946f42d601776e9ca8a (commit)
via 02c542d173228b45bde7895d9ecd1e00b7129769 (commit)
via 1a200cffc994858c8cad91b9b00093d24f00e79a (commit)
from 0f7ee3ea4e63a646ae5d02207530493016240f43 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit e3b5a052ecd0eb5c53f669c5218f360b016fe128
Author: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat May 17 15:32:56 2014 +0200
core78: Update filelist.
commit 53ac77f61004852ad7a593e0a4441619aaecd300
Merge: ace810a 5a9f406
Author: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat May 17 15:27:53 2014 +0200
Merge remote-tracking branch 'stevee/ddns-providers' into next
commit ace810a3f85f58a59c4ca430b61d052817e7362c
Author: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Fri May 16 22:07:14 2014 +0200
snort: Update url's for rule download.
commit cf6abf539ed973c6bb053293cafeee01e60ac0d1
Merge: 0805688 edb7235
Author: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat May 17 15:18:52 2014 +0200
Merge remote-tracking branch 'alpha197/patch-1' into next
commit 080568824d60c86189a49d272a390f81c86a0eba
Merge: 0f7ee3e 1a200cf
Author: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat May 17 15:18:43 2014 +0200
Merge remote-tracking branch 'origin/master' into next
commit 5a9f40613eea53a15e3cf6dc6348114329871ac3
Author: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Thu May 15 18:47:13 2014 +0200
setddns.pl: Switch off debuging output.
Switch off accidently enabled debugging output from commit
dc98645fd42873dfeda01188243565e2f977f4a9
commit f353972f3f84da9873f0512dc8810a20408fde2c
Author: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Wed May 14 19:52:06 2014 +0200
Change update url for spDNS.de.
commit edb7235c38554f9a02a03cd1b58f027cae43cf8c
Author: alpha197 <alpha197@users.noreply.github.com>
Date: Tue May 13 19:00:04 2014 +0200
xen-image-maker: Fix wrong menu entry for pygrub
Should fix https://bugzilla.ipfire.org/show_bug.cgi?id=10499
commit 9cf34ad1ed74f88a139e620fff476e6ae0a9707f
Author: Bernhard Bitsch <bbitsch@ipfire.org>
Date: Mon May 12 19:50:50 2014 +0200
DDNS: Add support for spdns.de.
This commit adds support for the dynamic dns service provider spdns.de.
Fixes #10533.
commit b1ab4a4dd0cce83c838b9946f42d601776e9ca8a
Author: Stefan Ernst <sternst@ernx.de>
Date: Sun May 11 19:53:00 2014 +0200
DDNS: Add support for variomedia.de.
This commit adds support for the dynamic dns service provider variomedia.de.
Fixes #10485.
commit 02c542d173228b45bde7895d9ecd1e00b7129769
Author: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Wed Jan 29 15:31:23 2014 +0100
DDNS: Add support for twodns.de.
This commit adds support for the dynamic dns service provider twodns.de.
Fixes #10418.
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/core/78/filelists/files | 4 ++
config/rootfiles/packages/clamav | 8 ++-
config/xen-image/xen-image-maker.sh | 2 +-
html/cgi-bin/ddns.cgi | 6 ++
html/cgi-bin/ids.cgi | 4 +-
lfs/clamav | 7 ++-
src/scripts/setddns.pl | 104 ++++++++++++++++++++++++++++++-
7 files changed, 125 insertions(+), 10 deletions(-)
Difference in files:
diff --git a/config/rootfiles/core/78/filelists/files \
b/config/rootfiles/core/78/filelists/files index 91b624e..15c629b 100644
--- a/config/rootfiles/core/78/filelists/files
+++ b/config/rootfiles/core/78/filelists/files
@@ -1,12 +1,16 @@
etc/system-release
etc/issue
+srv/web/ipfire/cgi-bin/ddns.cgi
+srv/web/ipfire/cgi-bin/ids.cgi
srv/web/ipfire/cgi-bin/logs.cgi/firewalllogcountry.dat
srv/web/ipfire/cgi-bin/logs.cgi/showrequestfromcountry.dat
srv/web/ipfire/cgi-bin/modem-status.cgi
srv/web/ipfire/cgi-bin/ovpnmain.cgi
srv/web/ipfire/cgi-bin/proxy.cgi
srv/web/ipfire/html/themes/ipfire/include/functions.pl
+usr/local/bin/setddns.pl
var/ipfire/langs
var/ipfire/menu.d/20-status.menu
var/ipfire/menu.d/70-log.menu
+var/ipfire/modem-lib.pl
var/ipfire/ovpn/openssl/ovpn.cnf
diff --git a/config/rootfiles/packages/clamav b/config/rootfiles/packages/clamav
index 885af45..e27eba6 100644
--- a/config/rootfiles/packages/clamav
+++ b/config/rootfiles/packages/clamav
@@ -4,21 +4,22 @@ usr/bin/clamconf
usr/bin/clamdscan
usr/bin/clamdtop
usr/bin/clamscan
+usr/bin/clamsubmit
usr/bin/freshclam
usr/bin/sigtool
#usr/include/clamav.h
#usr/lib/libclamav.la
usr/lib/libclamav.so
usr/lib/libclamav.so.6
-usr/lib/libclamav.so.6.1.20
+usr/lib/libclamav.so.6.1.22
#usr/lib/libclamunrar.la
usr/lib/libclamunrar.so
usr/lib/libclamunrar.so.6
-usr/lib/libclamunrar.so.6.1.20
+usr/lib/libclamunrar.so.6.1.22
#usr/lib/libclamunrar_iface.la
usr/lib/libclamunrar_iface.so
usr/lib/libclamunrar_iface.so.6
-usr/lib/libclamunrar_iface.so.6.1.20
+usr/lib/libclamunrar_iface.so.6.1.22
#usr/lib/pkgconfig/libclamav.pc
usr/sbin/clamd
usr/share/clamav
@@ -27,6 +28,7 @@ usr/share/clamav
#usr/share/man/man1/clamdscan.1
#usr/share/man/man1/clamdtop.1
#usr/share/man/man1/clamscan.1
+#usr/share/man/man1/clamsubmit.1
#usr/share/man/man1/freshclam.1
#usr/share/man/man1/sigtool.1
#usr/share/man/man5/clamav-milter.conf.5
diff --git a/config/xen-image/xen-image-maker.sh \
b/config/xen-image/xen-image-maker.sh index a42ad5b..1a2a004 100644
--- a/config/xen-image/xen-image-maker.sh
+++ b/config/xen-image/xen-image-maker.sh
@@ -121,7 +121,7 @@ mkdir $MNThdd/boot/grub
echo "timeout 10" > $MNThdd/boot/grub/grub.conf
echo "default 0" >> $MNThdd/boot/grub/grub.conf
echo "title IPFire ($KERN_TYPE-kernel)" >> $MNThdd/boot/grub/grub.conf
-echo " kernel /vmlinuz-$KVER-ipfire-xen root=/dev/xvda3 rootdelay=10 panic=10 \
console=$CONSOLE ro" \ +echo " kernel /vmlinuz-$KVER-ipfire-$KERN_TYPE \
root=/dev/xvda3 rootdelay=10 panic=10 console=$CONSOLE ro" \ >> \
$MNThdd/boot/grub/grub.conf echo " initrd /ipfirerd-$KVER-$KERN_TYPE.img" >> \
$MNThdd/boot/grub/grub.conf echo "# savedefault 0" >> $MNThdd/boot/grub/grub.conf
diff --git a/html/cgi-bin/ddns.cgi b/html/cgi-bin/ddns.cgi
index 4e51ab6..4b4bc63 100644
--- a/html/cgi-bin/ddns.cgi
+++ b/html/cgi-bin/ddns.cgi
@@ -253,8 +253,11 @@ $checked{'SERVICE'}{'nsupdate'} = '';
$checked{'SERVICE'}{'ovh.com'} = '';
$checked{'SERVICE'}{'regfish.com'} = '';
$checked{'SERVICE'}{'selfhost.de'} = '';
+$checked{'SERVICE'}{'spdns.org'} = '';
$checked{'SERVICE'}{'strato.com'} = '';
+$checked{'SERVICE'}{'twodns.de'} = '';
$checked{'SERVICE'}{'tzo.com'} = '';
+$checked{'SERVICE'}{'variomedia.de'} = '';
$checked{'SERVICE'}{'zoneedit.com'} = '';
$checked{'SERVICE'}{$settings{'SERVICE'}} = "selected='selected'";
@@ -349,8 +352,11 @@ print <<END
<option $checked{'SERVICE'}{'ovh.com'}>ovh.com</option>
<option $checked{'SERVICE'}{'regfish.com'}>regfish.com</option>
<option $checked{'SERVICE'}{'selfhost.de'}>selfhost.de</option>
+ <option $checked{'SERVICE'}{'spdns.org'}>spdns.org</option>
<option $checked{'SERVICE'}{'strato.com'}>strato.com</option>
+ <option $checked{'SERVICE'}{'twodns.de'}>twodns.de</option>
<!-- <option $checked{'SERVICE'}{'tzo.com'}>tzo.com</option> comment this \
service out until a working fix is developed --> + <option \
$checked{'SERVICE'}{'variomedia.de'}>variomedia.de</option> <option \
$checked{'SERVICE'}{'zoneedit.com'}>zoneedit.com</option> </select></td>
<td width='20%' class='base'>$Lang::tr{'hostname'}: <img src='/blob.gif' \
alt='*' /></td>
diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi
index 55e2645..5a28daa 100644
--- a/html/cgi-bin/ids.cgi
+++ b/html/cgi-bin/ids.cgi
@@ -263,9 +263,9 @@ if (-e "/etc/snort/snort.conf") {
####################### End added for snort rules control \
#################################
if ($snortsettings{'RULES'} eq 'subscripted') {
- $url=" http://www.snort.org/sub-rules/snortrules-snapshot-2953.tar.gz/$snortsettings{'OINKCODE'}";
+ $url=" http://www.snort.org/sub-rules/snortrules-snapshot-2961.tar.gz/$snortsettings{'OINKCODE'}";
} elsif ($snortsettings{'RULES'} eq 'registered') {
- $url=" http://www.snort.org/reg-rules/snortrules-snapshot-2950.tar.gz/$snortsettings{'OINKCODE'}";
+ $url=" http://www.snort.org/reg-rules/snortrules-snapshot-2960.tar.gz/$snortsettings{'OINKCODE'}";
} elsif ($snortsettings{'RULES'} eq 'community') {
$url=" http://s3.amazonaws.com/snort-org/www/rules/community/community-rules.tar.gz";
} else {
diff --git a/lfs/clamav b/lfs/clamav
index 4a9a5a2..8cb849b 100644
--- a/lfs/clamav
+++ b/lfs/clamav
@@ -24,7 +24,7 @@
include Config
-VER = 0.98.1
+VER = 0.98.3
THISAPP = clamav-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = clamav
-PAK_VER = 24
+PAK_VER = 25
DEPS = ""
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = b1ec7b19dea8385954515ef1d63576d8
+$(DL_FILE)_MD5 = b649d35ee85d4d6075a98173dd255c17
install : $(TARGET)
@@ -96,6 +96,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
# Disable PaX mprotect for clamd and freshclam
paxctl -cm /usr/sbin/clamd
+ paxctl -cm /usr/bin/clamscan
paxctl -cm /usr/bin/freshclam
@rm -rf $(DIR_APP)
diff --git a/src/scripts/setddns.pl b/src/scripts/setddns.pl
index f97e750..e26c524 100644
--- a/src/scripts/setddns.pl
+++ b/src/scripts/setddns.pl
@@ -51,7 +51,7 @@ if ($ip eq "unavailable") {
exit(0);
}
-&General::log("Dynamic DNS public router IP is: $ip");
+#&General::log("Dynamic DNS public router IP is: $ip");
if ($ARGV[0] eq '-f') {
unlink ($cachefile); # next regular calls will try again if this force update \
fails. @@ -400,6 +400,41 @@ if ($ip ne $ipcache) {
&General::log("Dynamic DNS ip-update for \
$settings{'HOSTNAME'}.$settings{'DOMAIN'} : failure (could not connect to server)"); \
} }
+ elsif ($settings{'SERVICE'} eq 'spdns.de') {
+ # use proxy ?
+ my %proxysettings;
+ &General::readhash("${General::swroot}/proxy/settings", \
\%proxysettings); + if \
($_=$proxysettings{'UPSTREAM_PROXY'}) { + my ($peer, \
$peerport) = (/^(?:[a-zA-Z \
]+\:\/\/)?(?:[A-Za-z0-9\_\.\-]*?(?:\:[A-Za-z0-9\_\.\-]*?)?\@)?([a-zA-Z0-9\.\_\-]*?)(?:\:([0-9]{1,5}))?(?:\/.*?)?$/);
+ \
Net::SSLeay::set_proxy($peer,$peerport,$proxysettings{'UPSTREAM_USER'},$proxysettings{'UPSTREAM_PASSWORD'} \
); + }
+
+ if ($settings{'HOSTNAME'} eq '') {
+ $settings{'HOSTDOMAIN'} = $settings{'DOMAIN'};
+ } else {
+ $settings{'HOSTDOMAIN'} = \
"$settings{'HOSTNAME'}.$settings{'DOMAIN'}"; + }
+
+ my ($out, $response) = Net::SSLeay::get_https( \
'update.spdns.de', 443, + \
"/nic/update?&hostname=$settings{'HOSTDOMAIN'}&myip=$ip", + \
Net::SSLeay::make_headers('User-Agent' => 'IPFire' , + \
'Authorization' => 'Basic ' . \
encode_base64("$settings{'LOGIN'}:$settings{'PASSWORD'}")) + \
); +
+ #Valid responses from service are:
+ # good xxx.xxx.xxx.xxx
+ # nochg xxx.xxx.xxx.xxx
+ if ($response =~ m%HTTP/1\.. 200 OK%) {
+ if ($out !~ m/good |nochg /ig) {
+ &General::log("Dynamic DNS ip-update for \
$settings{'HOSTDOMAIN'} : failure ($out)"); + } else {
+ &General::log("Dynamic DNS ip-update for \
$settings{'HOSTDOMAIN'} : success"); + $success++;
+ }
+ } else {
+ &General::log("Dynamic DNS ip-update for \
$settings{'HOSTDOMAIN'} : failure (could not connect to server)"); + \
} + }
elsif ($settings{'SERVICE'} eq 'strato') {
# use proxy ?
my %proxysettings;
@@ -650,6 +685,73 @@ if ($ip ne $ipcache) {
&General::log("Dynamic DNS ip-update for $settings{'HOSTDOMAIN'} : failure \
(could not connect to server, check your credentials---$out-$response--)"); }
}
+ elsif ($settings{'SERVICE'} eq 'twodns.de') {
+ # use proxy ?
+ my %proxysettings;
+ &General::readhash("${General::swroot}/proxy/settings", \
\%proxysettings); + if \
($_=$proxysettings{'UPSTREAM_PROXY'}) { + my ($peer, \
$peerport) = (/^(?:[a-zA-Z \
]+\:\/\/)?(?:[A-Za-z0-9\_\.\-]*?(?:\:[A-Za-z0-9\_\.\-]*?)?\@)?([a-zA-Z0-9\.\_\-]*?)(?:\:([0-9]{1,5}))?(?:\/.*?)?$/);
+ \
Net::SSLeay::set_proxy($peer,$peerport,$proxysettings{'UPSTREAM_USER'},$proxysettings{'UPSTREAM_PASSWORD'} \
); + }
+
+ if ($settings{'HOSTNAME'} eq '') {
+ $settings{'HOSTDOMAIN'} = $settings{'DOMAIN'};
+ } else {
+ $settings{'HOSTDOMAIN'} = \
"$settings{'HOSTNAME'}.$settings{'DOMAIN'}"; + }
+
+ my ($out, $response) = Net::SSLeay::get_https( \
'update.twodns.de', + \
443, + "/update?hostname=$settings{'HOSTDOMAIN'}&ip=$ip",
+ \
Net::SSLeay::make_headers('User-Agent' => 'IPFire', + \
'Authorization' => 'Basic ' . \
encode_base64("$settings{'LOGIN'}:$settings{'PASSWORD'}")) ); +
+ # Valid response are 'ok' 'nochange'
+ if ($response =~ m%HTTP/1\.. 200 OK%) {
+ if ( $out !~ m/^(good|nochg)/ ) {
+ $out =~ s/\n/ /g;
+ &General::log("Dynamic DNS ip-update for \
$settings{'HOSTDOMAIN'} : failure ($out)"); + } else {
+ &General::log("Dynamic DNS ip-update for \
$settings{'HOSTDOMAIN'} : success"); + $success++;
+ }
+ } else {
+ &General::log("Dynamic DNS ip-update for \
$settings{'HOSTDOMAIN'} : failure (could not connect to server, check your \
credentials---$out-$response--)"); + }
+ }
+ elsif ($settings{'SERVICE'} eq 'variomedia') {
+ # use proxy ?
+ my %proxysettings;
+ &General::readhash("${General::swroot}/proxy/settings", \%proxysettings);
+ if ($_=$proxysettings{'UPSTREAM_PROXY'}) {
+ my ($peer, $peerport) = (/^(?:[a-zA-Z \
]+\:\/\/)?(?:[A-Za-z0-9\_\.\-]*?(?:\:[A-Za-z0-9\_\.\-]*?)?\@)?([a-zA-Z0-9\.\_\-]*?)(?:\:([0-9]{1,5}))?(?:\/.*?)?$/);
+ Net::SSLeay::set_proxy($peer,$peerport,$proxysettings{'UPSTREAM_USER'},$proxysettings{'UPSTREAM_PASSWORD'} \
); + }
+
+ if ($settings{'HOSTNAME'} eq '') {
+ $settings{'HOSTDOMAIN'} = $settings{'DOMAIN'};
+ } else {
+ $settings{'HOSTDOMAIN'} = "$settings{'HOSTNAME'}.$settings{'DOMAIN'}";
+ }
+
+ my ($out, $response) = Net::SSLeay::get_https( 'dyndns.variomedia.de',
+ 443,
+ "/nic/update?hostname=$settings{'HOSTDOMAIN'}&myip=$ip",
+ Net::SSLeay::make_headers('User-Agent' => 'IPFire',
+ 'Authorization' => 'Basic ' . \
encode_base64("$settings{'LOGIN'}:$settings{'PASSWORD'}")) ); +
+ # Valid response is 'good $ip'
+ if ($response =~ m%HTTP/1\.. 200 OK%) {
+ if ( $out !~ m/^good $ip/ ) {
+ &General::log("Dynamic DNS ip-update for $settings{'HOSTDOMAIN'} ($ip) : \
failure ($out)"); + } else {
+ &General::log("Dynamic DNS ip-update for $settings{'HOSTDOMAIN'} ($ip) : \
success"); + $success++;
+ }
+ } else {
+ &General::log("Dynamic DNS ip-update for $settings{'HOSTDOMAIN'} : failure \
(could not connect to server, check your credentials---$out-$response--)"); + \
} + }
else {
if ($settings{'WILDCARDS'} eq 'on') {
$settings{'WILDCARDS'} = '-w';
hooks/post-receive
--
IPFire 2.x development tree
_______________________________________________
IPFire-SCM mailing list
IPFire-SCM@lists.ipfire.org
http://lists.ipfire.org/mailman/listinfo/ipfire-scm
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic