[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 0300b3f0993c9af5d5cb4f83a4b91fd2a1ffaeba
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 0300b3f0993c9af5d5cb4f83a4b91fd2a1ffaeba (commit) via 5973563f8b08b18b0c4f29a6de6f3ae56eb24fea (commit) via ec0a3859bd4730169715176939e983ff2765bc64 (commit) via 77c3c15432500f1b79d4e9de69973c8694f4e98d (commit) via 024f02c1244290ceb60eedfe0fd04fd7526b0ad5 (commit) via e100d97b042cb3e7047b51b617234ce4c02bf7ed (commit) via 82bd80b38719bd800c31b68d974f65249debf503 (commit) via 635a44bfad1fffad2d648d898a0e513172dc2f3b (commit) via 29da3718b1eccef8633fbfb7e2685ecad7113b64 (commit) from 5e7c87280ea736ff2811c8ee332c9049186ac43d (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 0300b3f0993c9af5d5cb4f83a4b91fd2a1ffaeba Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Jan 11 21:28:13 2015 +0100
core87: Add changed rootfiles and uninstall sqlite
commit 5973563f8b08b18b0c4f29a6de6f3ae56eb24fea Merge: 5e7c872 ec0a385 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Jan 11 21:24:17 2015 +0100
Merge remote-tracking branch 'stevee/next-ddns-update' into next
commit ec0a3859bd4730169715176939e983ff2765bc64 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sun Jan 11 18:21:59 2015 +0100
Remove sqlite as dependcy from various addons.
sqlite has become a core component in commit 024f02c1244290ceb60eedfe0fd04fd7526b0ad5.
commit 77c3c15432500f1b79d4e9de69973c8694f4e98d Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sun Jan 11 17:02:46 2015 +0100
sqlite: Update to 080704.
commit 024f02c1244290ceb60eedfe0fd04fd7526b0ad5 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sat Jan 10 20:15:02 2015 +0100
sqlite: Move to IPFire core.
sqlite is a runtime dependency of ddns >= 005.
commit e100d97b042cb3e7047b51b617234ce4c02bf7ed Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sat Jan 10 20:14:20 2015 +0100
ddns: Rootfile update.
commit 82bd80b38719bd800c31b68d974f65249debf503 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Thu Aug 28 22:16:07 2014 +0200
ddns.cgi: Add support for token based auth for spdns.de.
commit 635a44bfad1fffad2d648d898a0e513172dc2f3b Author: Stefan Schantl stefan.schantl@ipfire.org Date: Mon Jan 5 23:13:47 2015 +0100
ddns: Add latest patches.
Add patches to fix an authentication problem against spdns.org and to add changeip as new provider.
commit 29da3718b1eccef8633fbfb7e2685ecad7113b64 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Mon Jan 5 21:51:04 2015 +0100
ddns: Update to version 005.
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/common/ddns | 3 + config/rootfiles/{packages => common}/sqlite | 0 .../{oldcore/81 => core/87}/filelists/ddns | 0 config/rootfiles/core/87/filelists/sqlite | 1 + config/rootfiles/core/87/update.sh | 5 ++ html/cgi-bin/ddns.cgi | 2 +- lfs/ddns | 7 +- lfs/mediatomb | 4 +- lfs/minidlna | 4 +- lfs/pakfire3 | 4 +- lfs/sqlite | 11 +-- src/patches/ddns/ddns-005-Add-changeip-com.patch | 85 ++++++++++++++++++++++ src/patches/ddns/ddns-005-SPDNS-fix-auth.patch | 23 ++++++ 13 files changed, 131 insertions(+), 18 deletions(-) rename config/rootfiles/{packages => common}/sqlite (100%) copy config/rootfiles/{oldcore/81 => core/87}/filelists/ddns (100%) create mode 120000 config/rootfiles/core/87/filelists/sqlite create mode 100644 src/patches/ddns/ddns-005-Add-changeip-com.patch create mode 100644 src/patches/ddns/ddns-005-SPDNS-fix-auth.patch
Difference in files: diff --git a/config/rootfiles/common/ddns b/config/rootfiles/common/ddns index f93965c..446656e 100644 --- a/config/rootfiles/common/ddns +++ b/config/rootfiles/common/ddns @@ -6,6 +6,9 @@ usr/lib/python2.7/site-packages/ddns/__init__.pyo usr/lib/python2.7/site-packages/ddns/__version__.py usr/lib/python2.7/site-packages/ddns/__version__.pyc usr/lib/python2.7/site-packages/ddns/__version__.pyo +usr/lib/python2.7/site-packages/ddns/database.py +usr/lib/python2.7/site-packages/ddns/database.pyc +usr/lib/python2.7/site-packages/ddns/database.pyo usr/lib/python2.7/site-packages/ddns/errors.py usr/lib/python2.7/site-packages/ddns/errors.pyc usr/lib/python2.7/site-packages/ddns/errors.pyo diff --git a/config/rootfiles/common/sqlite b/config/rootfiles/common/sqlite new file mode 100644 index 0000000..f3b0b36 --- /dev/null +++ b/config/rootfiles/common/sqlite @@ -0,0 +1,10 @@ +usr/bin/sqlite3 +#usr/include/sqlite3.h +#usr/include/sqlite3ext.h +#usr/lib/libsqlite3.a +#usr/lib/libsqlite3.la +usr/lib/libsqlite3.so +usr/lib/libsqlite3.so.0 +usr/lib/libsqlite3.so.0.8.6 +#usr/lib/pkgconfig/sqlite3.pc +#usr/share/man/man1/sqlite3.1 diff --git a/config/rootfiles/core/87/filelists/ddns b/config/rootfiles/core/87/filelists/ddns new file mode 120000 index 0000000..7395164 --- /dev/null +++ b/config/rootfiles/core/87/filelists/ddns @@ -0,0 +1 @@ +../../../common/ddns \ No newline at end of file diff --git a/config/rootfiles/core/87/filelists/sqlite b/config/rootfiles/core/87/filelists/sqlite new file mode 120000 index 0000000..4ea5697 --- /dev/null +++ b/config/rootfiles/core/87/filelists/sqlite @@ -0,0 +1 @@ +../../../common/sqlite \ No newline at end of file diff --git a/config/rootfiles/core/87/update.sh b/config/rootfiles/core/87/update.sh index ad06686..f21fc03 100644 --- a/config/rootfiles/core/87/update.sh +++ b/config/rootfiles/core/87/update.sh @@ -43,6 +43,11 @@ extract_files # Update Language cache perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
+# Uninstall the sqlite package. +rm -f \ + /opt/pakfire/db/installed/meta-sqlite \ + /opt/pakfire/db/rootfiles/sqlite + sync
# This update need a reboot... diff --git a/config/rootfiles/packages/sqlite b/config/rootfiles/packages/sqlite deleted file mode 100644 index f3b0b36..0000000 --- a/config/rootfiles/packages/sqlite +++ /dev/null @@ -1,10 +0,0 @@ -usr/bin/sqlite3 -#usr/include/sqlite3.h -#usr/include/sqlite3ext.h -#usr/lib/libsqlite3.a -#usr/lib/libsqlite3.la -usr/lib/libsqlite3.so -usr/lib/libsqlite3.so.0 -usr/lib/libsqlite3.so.0.8.6 -#usr/lib/pkgconfig/sqlite3.pc -#usr/share/man/man1/sqlite3.1 diff --git a/html/cgi-bin/ddns.cgi b/html/cgi-bin/ddns.cgi index 55841b2..ea30319 100644 --- a/html/cgi-bin/ddns.cgi +++ b/html/cgi-bin/ddns.cgi @@ -667,7 +667,7 @@ sub GenerateDDNSConfigFile { my $use_token = 0;
# Handle token based auth for various providers. - if ($provider ~~ ["dns.lightningwirelabs.com", "entrydns.net", "regfish.com"] && $username eq "token") { + if ($provider ~~ ["dns.lightningwirelabs.com", "entrydns.net", "regfish.com", "spdns.de"] && $username eq "token") { $use_token = 1;
# Handle token auth for freedns.afraid.org and regfish.com. diff --git a/lfs/ddns b/lfs/ddns index b94b3a1..6efc418 100644 --- a/lfs/ddns +++ b/lfs/ddns @@ -24,7 +24,7 @@
include Config
-VER = 004 +VER = 005
THISAPP = ddns-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = ff77cb72d0cb06c73bde70419b15bae8 +$(DL_FILE)_MD5 = 5fb0e7c8a775ae03074ad90d5a251a4c
install : $(TARGET)
@@ -71,6 +71,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/ddns/ddns-005-Add-changeip-com.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/ddns/ddns-005-SPDNS-fix-auth.patch + cd $(DIR_APP) && [ -x "configure" ] || sh ./autogen.sh cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/var/ipfire cd $(DIR_APP) && make $(MAKETUNING) diff --git a/lfs/mediatomb b/lfs/mediatomb index 7de579e..5811a0a 100644 --- a/lfs/mediatomb +++ b/lfs/mediatomb @@ -32,9 +32,9 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = mediatomb -PAK_VER = 4 +PAK_VER = 5
-DEPS = "ffmpeg-libs libexif sqlite taglib " +DEPS = "ffmpeg-libs libexif taglib "
############################################################################### # Top-level Rules diff --git a/lfs/minidlna b/lfs/minidlna index 155cd4a..1c3f61c 100644 --- a/lfs/minidlna +++ b/lfs/minidlna @@ -32,9 +32,9 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = minidlna -PAK_VER = 3 +PAK_VER = 4
-DEPS = "ffmpeg flac libexif libid3tag libogg sqlite" +DEPS = "ffmpeg flac libexif libid3tag libogg"
############################################################################### # Top-level Rules diff --git a/lfs/pakfire3 b/lfs/pakfire3 index 8fb810d..d71d424 100644 --- a/lfs/pakfire3 +++ b/lfs/pakfire3 @@ -32,9 +32,9 @@ DL_FROM = http://source.ipfire.org/releases/pakfire/ DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = pakfire3 -PAK_VER = 4 +PAK_VER = 5
-DEPS = "libsolv pycurl pygpgme python-progressbar python-xattr sqlite urlgrabber" +DEPS = "libsolv pycurl pygpgme python-progressbar python-xattr urlgrabber"
############################################################################### # Top-level Rules diff --git a/lfs/sqlite b/lfs/sqlite index 5bc694a..903bcb2 100644 --- a/lfs/sqlite +++ b/lfs/sqlite @@ -24,17 +24,13 @@
include Config
-VER = 3070603 +VER = 3080704
THISAPP = sqlite-autoconf-$(VER) DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) -PROG = sqlite -PAK_VER = 2 - -DEPS = ""
############################################################################### # Top-level Rules @@ -44,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 7eb41eea5ffa5cbe359a48629084c425 +$(DL_FILE)_MD5 = 33bb8db0038317ce1b0480ca1185c7ba
install : $(TARGET)
@@ -67,9 +63,6 @@ $(patsubst %,$(DIR_DL)/%,$(objects)) : $(subst %,%_MD5,$(objects)) : @$(MD5)
-dist: - @$(PAK) - ############################################################################### # Installation Details ############################################################################### diff --git a/src/patches/ddns/ddns-005-Add-changeip-com.patch b/src/patches/ddns/ddns-005-Add-changeip-com.patch new file mode 100644 index 0000000..15bcd46 --- /dev/null +++ b/src/patches/ddns/ddns-005-Add-changeip-com.patch @@ -0,0 +1,85 @@ +commit 78046ffe2187d91c61d6c2f910249b8a5be71b08 +Author: Stefan Schantl stefan.schantl@ipfire.org +Date: Wed Oct 22 21:39:09 2014 +0200 + + Add changeip.com as new provider. + + Fixes #10639. + +diff --git a/README b/README +index 5944102..6a06f4b 100644 +--- a/README ++++ b/README +@@ -49,6 +49,7 @@ INSTALLATION: + + SUPPORTED PROVIDERS: + all-inkl.com ++ changeip.com + dhs.org + dns.lightningwirelabs.com + dnspark.com +diff --git a/ddns.conf.sample b/ddns.conf.sample +index d3ac53f..0048a46 100644 +--- a/ddns.conf.sample ++++ b/ddns.conf.sample +@@ -30,6 +30,11 @@ + # secret = XYZ + # ttl = 60 + ++# [test.changeip.com] ++# provider = changeip.com ++# username = user ++# password = pass ++ + # [test.dhs.org] + # provider = dhs.org + # username = user +diff --git a/src/ddns/providers.py b/src/ddns/providers.py +index 1e88995..587d5ff 100644 +--- a/src/ddns/providers.py ++++ b/src/ddns/providers.py +@@ -539,6 +539,44 @@ class DDNSProviderBindNsupdate(DDNSProvider): + return "\n".join(scriptlet) + + ++class DDNSProviderChangeIP(DDNSProvider): ++ handle = "changeip.com" ++ name = "ChangeIP.com" ++ website = "https://changeip.com" ++ protocols = ("ipv4",) ++ ++ # Detailed information about the update api can be found here. ++ # http://www.changeip.com/accounts/knowledgebase.php?action=displayarticle&... ++ ++ url = "https://nic.changeip.com/nic/update" ++ can_remove_records = False ++ ++ def update_protocol(self, proto): ++ data = { ++ "hostname" : self.hostname, ++ "myip" : self.get_address(proto), ++ } ++ ++ # Send update to the server. ++ try: ++ response = self.send_request(self.url, username=self.username, password=self.password, ++ data=data) ++ ++ # Handle error codes. ++ except urllib2.HTTPError, e: ++ if e.code == 422: ++ raise DDNSRequestError(_("Domain not found.")) ++ ++ raise ++ ++ # Handle success message. ++ if response.code == 200: ++ return ++ ++ # If we got here, some other update error happened. ++ raise DDNSUpdateError(_("Server response: %s") % output) ++ ++ + class DDNSProviderDHS(DDNSProvider): + handle = "dhs.org" + name = "DHS International" diff --git a/src/patches/ddns/ddns-005-SPDNS-fix-auth.patch b/src/patches/ddns/ddns-005-SPDNS-fix-auth.patch new file mode 100644 index 0000000..1d91baa --- /dev/null +++ b/src/patches/ddns/ddns-005-SPDNS-fix-auth.patch @@ -0,0 +1,23 @@ +commit 25f39b4e437627bd1a49393280271d59ad28b86e +Author: Stefan Schantl stefan.schantl@ipfire.org +Date: Mon Jan 5 21:37:55 2015 +0100 + + spdns.de: Fix authentication. + + There was a simple copy and paste issue which prevents a + correct authentication with username and password against the + providers API. + +diff --git a/src/ddns/providers.py b/src/ddns/providers.py +index 587d5ff..bcfb088 100644 +--- a/src/ddns/providers.py ++++ b/src/ddns/providers.py +@@ -1271,7 +1271,7 @@ class DDNSProviderSPDNS(DDNSProtocolDynDNS2, DDNSProvider): + + @property + def password(self): +- return self.get("username") or self.token ++ return self.get("password") or self.token + + + class DDNSProviderStrato(DDNSProtocolDynDNS2, DDNSProvider):
hooks/post-receive -- IPFire 2.x development tree
-
git＠ipfire.org