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 ff43197b01d45dd6119fb15586c2ce29bd4f8cb3 (commit) via 0aa71600efb5dcff104135ed4bf621a23ee19ced (commit) via a06723b1f4e87ee5b31dbc59e7b21a9e57750989 (commit) via f83b3c65a34b5e66255c77140724db684e3e460b (commit) from 552fb4b8b5aa738959848dafc20d41e6fdbdbe4e (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 ff43197b01d45dd6119fb15586c2ce29bd4f8cb3 Merge: 0aa7160 552fb4b Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Feb 4 14:35:55 2016 +0000
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
commit 0aa71600efb5dcff104135ed4bf621a23ee19ced Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Feb 4 14:31:53 2016 +0000
wirelessctrl: Remove some unused code
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit a06723b1f4e87ee5b31dbc59e7b21a9e57750989 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Jan 30 16:37:21 2016 +0000
core98: Ship updated tzdata
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit f83b3c65a34b5e66255c77140724db684e3e460b Author: Matthias Fischer matthias.fischer@ipfire.org Date: Sat Jan 30 11:07:46 2016 +0100
tzdata: Update to 2016a
Fixes https://bugzilla.ipfire.org/show_bug.cgi?id=11034
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/common/tzdata | 3 +++ config/rootfiles/{oldcore/90 => core/98}/filelists/tzdata | 0 lfs/tzdata | 8 ++++---- src/misc-progs/wirelessctrl.c | 9 --------- 4 files changed, 7 insertions(+), 13 deletions(-) copy config/rootfiles/{oldcore/90 => core/98}/filelists/tzdata (100%)
Difference in files: diff --git a/config/rootfiles/common/tzdata b/config/rootfiles/common/tzdata index a18ba0a..86b1e27 100644 --- a/config/rootfiles/common/tzdata +++ b/config/rootfiles/common/tzdata @@ -113,6 +113,7 @@ usr/share/zoneinfo #usr/share/zoneinfo/America/Eirunepe #usr/share/zoneinfo/America/El_Salvador #usr/share/zoneinfo/America/Ensenada +#usr/share/zoneinfo/America/Fort_Nelson #usr/share/zoneinfo/America/Fort_Wayne #usr/share/zoneinfo/America/Fortaleza #usr/share/zoneinfo/America/Glace_Bay @@ -717,6 +718,7 @@ usr/share/zoneinfo #usr/share/zoneinfo/posix/America/Eirunepe #usr/share/zoneinfo/posix/America/El_Salvador #usr/share/zoneinfo/posix/America/Ensenada +#usr/share/zoneinfo/posix/America/Fort_Nelson #usr/share/zoneinfo/posix/America/Fort_Wayne #usr/share/zoneinfo/posix/America/Fortaleza #usr/share/zoneinfo/posix/America/Glace_Bay @@ -1321,6 +1323,7 @@ usr/share/zoneinfo #usr/share/zoneinfo/right/America/Eirunepe #usr/share/zoneinfo/right/America/El_Salvador #usr/share/zoneinfo/right/America/Ensenada +#usr/share/zoneinfo/right/America/Fort_Nelson #usr/share/zoneinfo/right/America/Fort_Wayne #usr/share/zoneinfo/right/America/Fortaleza #usr/share/zoneinfo/right/America/Glace_Bay diff --git a/config/rootfiles/core/98/filelists/tzdata b/config/rootfiles/core/98/filelists/tzdata new file mode 120000 index 0000000..5a6e325 --- /dev/null +++ b/config/rootfiles/core/98/filelists/tzdata @@ -0,0 +1 @@ +../../../common/tzdata \ No newline at end of file diff --git a/lfs/tzdata b/lfs/tzdata index dfb54e6..5cc3fc8 100644 --- a/lfs/tzdata +++ b/lfs/tzdata @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2011 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2016 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@
include Config
-VER = 2015d +VER = 2016a TZDATA_VER = $(VER) TZCODE_VER = $(VER)
@@ -45,8 +45,8 @@ objects = tzdata$(TZDATA_VER).tar.gz tzcode$(TZCODE_VER).tar.gz tzdata$(TZDATA_VER).tar.gz = $(DL_FROM)/tzdata$(TZDATA_VER).tar.gz tzcode$(TZCODE_VER).tar.gz = $(DL_FROM)/tzcode$(TZCODE_VER).tar.gz
-tzdata$(TZDATA_VER).tar.gz_MD5 = b595bdc4474b8fc1a15cffc67c66025b -tzcode$(TZCODE_VER).tar.gz_MD5 = 4008a3abc025a398697b2587c48258b9 +tzdata$(TZDATA_VER).tar.gz_MD5 = 0d3123eb1b453ec0620822bd65be4c42 +tzcode$(TZCODE_VER).tar.gz_MD5 = f5e0299925631da7cf82d8ce1205111d
install : $(TARGET)
diff --git a/src/misc-progs/wirelessctrl.c b/src/misc-progs/wirelessctrl.c index 4a2e6dc..b2d3716 100644 --- a/src/misc-progs/wirelessctrl.c +++ b/src/misc-progs/wirelessctrl.c @@ -39,7 +39,6 @@ void exithandler(void) { }
int main(void) { - char green_dev[STRING_SIZE] = ""; char buffer[STRING_SIZE]; char *index, *ipaddress, *macaddress, *enabled; struct keyvalue *kv = NULL; @@ -68,14 +67,6 @@ int main(void) { exit(1); }
- /* Get the GREEN interface details */ - if (findkey(kv, "GREEN_DEV", green_dev) > 0) { - if (!VALID_DEVICE(green_dev)) { - fprintf(stderr, "Bad GREEN_DEV: %s\n", green_dev); - exit(1); - } - } - /* Get the BLUE interface details */ if (findkey(kv, "BLUE_DEV", blue_dev) > 0) { if ((strlen(blue_dev) > 0) && !VALID_DEVICE(blue_dev)) {
hooks/post-receive -- IPFire 2.x development tree