* [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 73b3a1264fcfbf93390ec9d9cb1f12ec62e73878
@ 2017-03-28 16:31 git
0 siblings, 0 replies; only message in thread
From: git @ 2017-03-28 16:31 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 12693 bytes --]
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 73b3a1264fcfbf93390ec9d9cb1f12ec62e73878 (commit)
via 776363274f82bb389b040bfe8f281edf5307e047 (commit)
via 21094f574e5a607159f25e77e25334d52ea31a7b (commit)
via 109b1914d1743e85727b01cd7388b19c278a60c2 (commit)
via baa8a93fd1817f4ad75aa1c22533a64a9c75b1c4 (commit)
via 0be884d6b222193419ddd3fdff02e7348fe92faf (commit)
via 2170bad5b99a10eff615e7e8c8b289e073985fc9 (commit)
from 4a0d69ca464aba3f27e7e2a98247f1630ef664bb (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 73b3a1264fcfbf93390ec9d9cb1f12ec62e73878
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Mar 28 17:20:50 2017 +0100
core110: Ship updated ntp package
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 776363274f82bb389b040bfe8f281edf5307e047
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Sat Mar 25 22:25:09 2017 +0100
ntp: Update to 4.2.8p10
"It addresses 6 medum- and 5 low-severity security issues, 4 informational security topics,
15 bugfixes, and contains other improvements over 4.2.8p9."
For a complete list, see:
http://support.ntp.org/bin/view/Main/SecurityNotice#Recent_Vulnerabilities
Best,
Matthias
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 21094f574e5a607159f25e77e25334d52ea31a7b
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Sat Mar 25 22:44:55 2017 +0100
mpd 0.20.6: fixes for lfs-file
Package refused to build without initscript.
Best,
Matthias
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 109b1914d1743e85727b01cd7388b19c278a60c2
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Mon Mar 27 21:01:54 2017 +0200
motion 4.0.1: suggested new rootfile
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit baa8a93fd1817f4ad75aa1c22533a64a9c75b1c4
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Sat Mar 25 22:50:18 2017 +0100
motion: Update to 4.0.1
'ffmpeg' seems to need this update.
Best,
Matthias
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 0be884d6b222193419ddd3fdff02e7348fe92faf
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Mar 28 17:15:35 2017 +0100
network: Create route to gateway
Some hosters have their gateway in a different subnet than
the RED interface is to save IPv4 address space.
This patch sets a host route to that gateway so that
IPFire can be installed in data centres that use such
technique.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 2170bad5b99a10eff615e7e8c8b289e073985fc9
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Mar 28 17:14:41 2017 +0100
setup: Allow setting netmask to 255.255.255.255
Some hosters require that the subnet mask of the RED network
is set to 255.255.255.255. This was not possible to save before.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/core/110/filelists/files | 1 +
.../{oldcore/100 => core/110}/filelists/ntp | 0
config/rootfiles/packages/motion | 45 +++++++++++++---------
lfs/motion | 12 +++---
lfs/mpd | 7 +++-
lfs/ntp | 6 +--
src/initscripts/networking/red | 3 ++
src/setup/netstuff.c | 5 ++-
8 files changed, 49 insertions(+), 30 deletions(-)
copy config/rootfiles/{oldcore/100 => core/110}/filelists/ntp (100%)
Difference in files:
diff --git a/config/rootfiles/core/110/filelists/files b/config/rootfiles/core/110/filelists/files
index c6d15d6..4a7d710 100644
--- a/config/rootfiles/core/110/filelists/files
+++ b/config/rootfiles/core/110/filelists/files
@@ -17,6 +17,7 @@ usr/lib/firewall/ipsec-block
usr/lib/libssp.so.0
usr/lib/libssp.so.0.0.0
usr/local/bin/xt_geoip_update
+usr/sbin/setup
var/ipfire/langs
var/ipfire/general-functions.pl
var/ipfire/graphs.pl
diff --git a/config/rootfiles/core/110/filelists/ntp b/config/rootfiles/core/110/filelists/ntp
new file mode 120000
index 0000000..7542d86
--- /dev/null
+++ b/config/rootfiles/core/110/filelists/ntp
@@ -0,0 +1 @@
+../../../common/ntp
\ No newline at end of file
diff --git a/config/rootfiles/packages/motion b/config/rootfiles/packages/motion
index aa3e5b7..82a8097 100644
--- a/config/rootfiles/packages/motion
+++ b/config/rootfiles/packages/motion
@@ -1,25 +1,32 @@
-#etc/motion-dist.conf
+etc/motion
etc/motion.conf
+etc/motion/camera1-dist.conf
+etc/motion/camera2-dist.conf
+etc/motion/camera3-dist.conf
+etc/motion/camera4-dist.conf
+#etc/motion/motion-dist.conf
usr/bin/motion
-#usr/share/doc/motion-3.2.12
-#usr/share/doc/motion-3.2.12/CHANGELOG
-#usr/share/doc/motion-3.2.12/COPYING
-#usr/share/doc/motion-3.2.12/CREDITS
-#usr/share/doc/motion-3.2.12/INSTALL
-#usr/share/doc/motion-3.2.12/README
-#usr/share/doc/motion-3.2.12/motion_guide.html
+#usr/share/doc/motion
+#usr/share/doc/motion/CHANGELOG
+#usr/share/doc/motion/COPYING
+#usr/share/doc/motion/CREDITS
+#usr/share/doc/motion/README.md
+#usr/share/doc/motion/mask1.png
+#usr/share/doc/motion/motion_guide.html
+#usr/share/doc/motion/normal.jpg
+#usr/share/doc/motion/outputmotion1.jpg
+#usr/share/doc/motion/outputnormal1.jpg
#usr/share/man/man1/motion.1
-#usr/share/motion-3.2.12
-#usr/share/motion-3.2.12/examples
-#usr/share/motion-3.2.12/examples/motion-dist.conf
-#usr/share/motion-3.2.12/examples/motion.init-Debian
-#usr/share/motion-3.2.12/examples/motion.init-Fedora
-#usr/share/motion-3.2.12/examples/motion.init-FreeBSD.sh
-#usr/share/motion-3.2.12/examples/motion.init-RH
-#usr/share/motion-3.2.12/examples/thread1.conf
-#usr/share/motion-3.2.12/examples/thread2.conf
-#usr/share/motion-3.2.12/examples/thread3.conf
-#usr/share/motion-3.2.12/examples/thread4.conf
+#usr/share/motion
+#usr/share/motion/examples
+#usr/share/motion/examples/camera1-dist.conf
+#usr/share/motion/examples/camera2-dist.conf
+#usr/share/motion/examples/camera3-dist.conf
+#usr/share/motion/examples/camera4-dist.conf
+#usr/share/motion/examples/motion-dist.conf
+#usr/share/motion/examples/motion.init-Debian
+#usr/share/motion/examples/motion.init-FreeBSD.sh
+#usr/share/motion/examples/motion.service
var/ipfire/backup/addons/includes/motion
etc/rc.d/init.d/motion
etc/rc.d/rc0.d/K01motion
diff --git a/lfs/motion b/lfs/motion
index a091338..d226c1c 100644
--- a/lfs/motion
+++ b/lfs/motion
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
+# Copyright (C) 2017 Michael Tremer & Christian Schmidt #
# #
# 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,16 +24,16 @@
include Config
-VER = 3.2.12
+VER = 4.0.1
-THISAPP = motion-$(VER)
+THISAPP = motion-release-$(VER)
DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = motion
-PAK_VER = 1
+PAK_VER = 2
DEPS = "ffmpeg"
###############################################################################
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 1ba0065ed50509aaffb171594c689f46
+$(DL_FILE)_MD5 = 5c87f90c4118d8cf0fb14700db69118f
install : $(TARGET)
@@ -81,6 +81,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
#Install obsolete V4L1 videodev.h
cp $(DIR_SRC)/config/include/obsolete_videodev.h /usr/include/linux/videodev.h
+ cd $(DIR_APP) && autoreconf -fiv
+
cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
diff --git a/lfs/mpd b/lfs/mpd
index cf28629..3213b27 100644
--- a/lfs/mpd
+++ b/lfs/mpd
@@ -77,7 +77,8 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && ./configure --prefix=/usr \
+ cd $(DIR_APP) && ./configure \
+ --prefix=/usr \
--disable-ipv6 \
--sysconfdir=/etc \
--disable-sqlite \
@@ -91,6 +92,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
--disable-icu
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
+
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,mpd)
+
@rm -rf $(DIR_APP)
touch /var/log/mpd.error.log
touch /var/log/mpd.log
diff --git a/lfs/ntp b/lfs/ntp
index 572bb88..1f1c524 100644
--- a/lfs/ntp
+++ b/lfs/ntp
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2017 IPFire Team <info(a)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 = 4.2.8p9
+VER = 4.2.8p10
THISAPP = ntp-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 857452b05f5f2e033786f77ade1974ed
+$(DL_FILE)_MD5 = 745384ed0dedb3f66b33fe84d66466f9
install : $(TARGET)
diff --git a/src/initscripts/networking/red b/src/initscripts/networking/red
index 9dfbad6..00e739c 100644
--- a/src/initscripts/networking/red
+++ b/src/initscripts/networking/red
@@ -124,6 +124,9 @@ case "${1}" in
echo -n "${DNS2}" > /var/ipfire/red/dns2
touch /var/ipfire/red/active
+ # Create route to default gateway
+ ip route add ${GATEWAY} dev ${DEVICE}
+
boot_mesg "Setting up default gateway ${GATEWAY}..."
ip route add default via ${GATEWAY} dev ${DEVICE}
evaluate_retval
diff --git a/src/setup/netstuff.c b/src/setup/netstuff.c
index 000411c..66592bb 100644
--- a/src/setup/netstuff.c
+++ b/src/setup/netstuff.c
@@ -75,7 +75,8 @@ int changeaddress(struct keyvalue *kv, char *colour, int typeflag,
int startstatictype = 0;
int startdhcptype = 0;
int startpppoetype = 0;
-
+ unsigned char buffer[sizeof(struct in_addr)];
+
/* Build some key strings. */
sprintf(addressfield, "%s_ADDRESS", colour);
sprintf(netmaskfield, "%s_NETMASK", colour);
@@ -184,7 +185,7 @@ int changeaddress(struct keyvalue *kv, char *colour, int typeflag,
strcat(message, "\n");
error = 1;
}
- if (inet_addr(netmaskresult) == INADDR_NONE)
+ if (inet_pton(AF_INET, netmaskresult, &buffer) == 0)
{
strcat(message, _("Network mask"));
strcat(message, "\n");
hooks/post-receive
--
IPFire 2.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2017-03-28 16:31 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-03-28 16:31 [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 73b3a1264fcfbf93390ec9d9cb1f12ec62e73878 git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox