IPFire-SCM January 2017

ipfire-scm@lists.ipfire.org

1 participants
23 discussions

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. c74c6a75887b0897432e0adbf4bdb008b9461497
by git＠ipfire.org 12 Jan '17

12 Jan '17

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 3.x development tree". The branch, master has been updated via c74c6a75887b0897432e0adbf4bdb008b9461497 (commit) via 511f2021c98bec9496a658d53d85c8277c9450a2 (commit) via 1f9065f77446acd5701a7e642629940bb44b93ac (commit) via 1e156ea95fb25ce1977b0f372afa9777572cd24e (commit) from 6ef6281c6c1432aefe17d3b9886da57c92203ed1 (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 c74c6a75887b0897432e0adbf4bdb008b9461497 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Thu Jan 12 10:08:02 2017 +0100 net-snmp: Update to 5.7.3 This is a minor update to the latest available version of net-snmp. * Drop SELinux support. Fixes #11216. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 511f2021c98bec9496a658d53d85c8277c9450a2 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Thu Jan 12 10:32:21 2017 +0100 ntp: Do not use a RPATH Fixes #11243. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 1f9065f77446acd5701a7e642629940bb44b93ac Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Thu Jan 12 10:19:39 2017 +0100 intltool: Enable testsuite * Drop automatically set configure switch. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 1e156ea95fb25ce1977b0f372afa9777572cd24e Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Thu Jan 12 09:08:42 2017 +0100 m4: Update to 1.4.18 This is an update to the latest stable version of m4. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: intltool/intltool.nm | 7 +- m4/m4.nm | 4 +- net-snmp/net-snmp.nm | 5 +- net-snmp/patches/net-snmp-5.5-apsl-copying.patch | 20 +-- net-snmp/patches/net-snmp-5.6-multilib.patch | 30 ++-- .../net-snmp-5.7.2-python-ipaddress-size.patch | 23 ---- net-snmp/patches/net-snmp-5.7.2-systemd.patch | 151 ++++++++++----------- ntp/ntp.nm | 5 +- 8 files changed, 109 insertions(+), 136 deletions(-) delete mode 100644 net-snmp/patches/net-snmp-5.7.2-python-ipaddress-size.patch Difference in files: diff --git a/intltool/intltool.nm b/intltool/intltool.nm index 1f0311c..bedcc53 100644 --- a/intltool/intltool.nm +++ b/intltool/intltool.nm @@ -5,7 +5,7 @@ name = intltool version = 0.51.0 -release = 1 +release = 2 arch = noarch groups = Localization/Tools @@ -28,8 +28,9 @@ build perl(XML::Parser) end - configure_options += \ - --mandir=/usr/share/man + test + make check + end end packages diff --git a/m4/m4.nm b/m4/m4.nm index f2dcea4..9b43055 100644 --- a/m4/m4.nm +++ b/m4/m4.nm @@ -4,8 +4,8 @@ ############################################################################### name = m4 -version = 1.4.17 -release = 2 +version = 1.4.18 +release = 1 groups = Applications/Text url = http://www.gnu.org/software/m4/ diff --git a/net-snmp/net-snmp.nm b/net-snmp/net-snmp.nm index dce0719..9e86e35 100644 --- a/net-snmp/net-snmp.nm +++ b/net-snmp/net-snmp.nm @@ -4,8 +4,8 @@ ############################################################################### name = net-snmp -version = 5.7.2 -release = 3 +version = 5.7.3 +release = 1 groups = Networking/Daemons url = http://net-snmp.sourceforge.net @@ -27,7 +27,6 @@ build bzip2-devel chrpath elfutils-devel - libselinux-devel lm-sensors-devel >= 3 openssl-devel perl(ExtUtils::Embed) diff --git a/net-snmp/patches/net-snmp-5.5-apsl-copying.patch b/net-snmp/patches/net-snmp-5.5-apsl-copying.patch index 43b85b6..5ae7ca3 100644 --- a/net-snmp/patches/net-snmp-5.5-apsl-copying.patch +++ b/net-snmp/patches/net-snmp-5.5-apsl-copying.patch @@ -11,15 +11,15 @@ the code to 'any subsequent version of this License published by Apple'. According to http://fedoraproject.org/wiki/Licensing, APSL ver. 2.0 is better for us. -diff -up net-snmp-5.5/COPYING.apsl net-snmp-5.5/COPYING ---- net-snmp-5.5/COPYING.apsl 2010-08-04 12:40:27.494479126 +0200 -+++ net-snmp-5.5/COPYING 2010-08-04 12:45:47.713684755 +0200 -@@ -292,3 +292,337 @@ ON ANY THEORY OF LIABILITY, WHETHER IN C - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - DAMAGE. +diff -up net-snmp-5.7.3/COPYING.skiFvk net-snmp-5.7.3/COPYING +--- net-snmp-5.7.3/COPYING.skiFvk 2015-02-17 13:33:15.963257594 +0100 ++++ net-snmp-5.7.3/COPYING 2015-02-17 13:33:37.931241818 +0100 +@@ -325,3 +325,337 @@ PROFITS; OR BUSINESS INTERRUPTION) HOWEV + LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + -+---- Part 10: APPLE PUBLIC SOURCE LICENSE (APSL 2.0) ---- ++---- Part 11: APPLE PUBLIC SOURCE LICENSE (APSL 2.0) ---- + +Version 2.0 - August 6, 2003 + @@ -333,8 +333,8 @@ diff -up net-snmp-5.5/COPYING.apsl net-snmp-5.5/COPYING + +Where You are located in the province of Quebec, Canada, the following clause +applies: The parties hereby confirm that they have requested that this License -+and all related documents be drafted in English. Les parties ont exigé que le -+présent contrat et tous les documents connexes soient rédigés en anglais. ++and all related documents be drafted in English. Les parties ont exige que le ++present contrat et tous les documents connexes soient rediges en anglais. + +EXHIBIT A. + diff --git a/net-snmp/patches/net-snmp-5.6-multilib.patch b/net-snmp/patches/net-snmp-5.6-multilib.patch index a50f5a8..9c12385 100644 --- a/net-snmp/patches/net-snmp-5.6-multilib.patch +++ b/net-snmp/patches/net-snmp-5.6-multilib.patch @@ -1,8 +1,6 @@ -Make the man pages multilib safe. - -diff -up net-snmp-5.6/man/netsnmp_config_api.3.def.multilib net-snmp-5.6/man/netsnmp_config_api.3.def ---- net-snmp-5.6/man/netsnmp_config_api.3.def.multilib 2010-09-08 17:41:37.000000000 +0200 -+++ net-snmp-5.6/man/netsnmp_config_api.3.def 2010-10-25 17:40:43.433726423 +0200 +diff -up net-snmp-5.7.3/man/netsnmp_config_api.3.def.oSBcEB net-snmp-5.7.3/man/netsnmp_config_api.3.def +--- net-snmp-5.7.3/man/netsnmp_config_api.3.def.oSBcEB 2014-12-08 21:23:22.000000000 +0100 ++++ net-snmp-5.7.3/man/netsnmp_config_api.3.def 2015-02-17 13:32:38.903284207 +0100 @@ -295,7 +295,7 @@ for one particular machine. .PP The default list of directories to search is \fC SYSCONFDIR/snmp\fP, @@ -19,24 +17,24 @@ diff -up net-snmp-5.6/man/netsnmp_config_api.3.def.multilib net-snmp-5.6/man/net -Default: SYSCONFDIR/snmp:DATADIR/snmp:LIBDIR/snmp:$HOME/.snmp +Default: SYSCONFDIR/snmp:DATADIR/snmp:/usr/lib(64)/snmp:$HOME/.snmp .SH "SEE ALSO" - .BR mib_api "(3), " snmp_api (3) + netsnmp_mib_api(3), snmp_api(3) .\" Local Variables: -diff -up net-snmp-5.6/man/snmp_config.5.def.multilib net-snmp-5.6/man/snmp_config.5.def ---- net-snmp-5.6/man/snmp_config.5.def.multilib 2010-09-17 11:51:52.000000000 +0200 -+++ net-snmp-5.6/man/snmp_config.5.def 2010-10-25 17:40:12.681976439 +0200 +diff -up net-snmp-5.7.3/man/snmp_config.5.def.oSBcEB net-snmp-5.7.3/man/snmp_config.5.def +--- net-snmp-5.7.3/man/snmp_config.5.def.oSBcEB 2015-02-17 13:32:04.251309092 +0100 ++++ net-snmp-5.7.3/man/snmp_config.5.def 2015-02-17 13:33:09.217262438 +0100 @@ -10,7 +10,7 @@ First off, there are numerous places tha found and read from. By default, the applications look for configuration files in the following 4 directories, in order: SYSCONFDIR/snmp, -DATADIR/snmp, LIBDIR/snmp, and $HOME/.snmp. In each of these +DATADIR/snmp, /usr/lib(64)/snmp, and $HOME/.snmp. In each of these - directories, it looks for files with the extension of both - .IR conf " and " local.conf - (reading the second ones last). In this manner, there are -diff -up net-snmp-5.6/man/snmpd.conf.5.def.multilib net-snmp-5.6/man/snmpd.conf.5.def ---- net-snmp-5.6/man/snmpd.conf.5.def.multilib 2010-09-17 11:51:52.000000000 +0200 -+++ net-snmp-5.6/man/snmpd.conf.5.def 2010-10-25 17:40:12.682976925 +0200 -@@ -1387,7 +1387,7 @@ filename), and call the initialisation r + directories, it looks for files snmp.conf, snmpd.conf and/or + snmptrapd.conf, as well as snmp.local.conf, snmpd.local.conf + and/or snmptrapd.local.conf. *.local.conf are always +diff -up net-snmp-5.7.3/man/snmpd.conf.5.def.oSBcEB net-snmp-5.7.3/man/snmpd.conf.5.def +--- net-snmp-5.7.3/man/snmpd.conf.5.def.oSBcEB 2014-12-08 21:23:22.000000000 +0100 ++++ net-snmp-5.7.3/man/snmpd.conf.5.def 2015-02-17 13:32:04.251309092 +0100 +@@ -1502,7 +1502,7 @@ filename), and call the initialisation r .RS .IP "Note:" If the specified PATH is not a fully qualified filename, it will diff --git a/net-snmp/patches/net-snmp-5.7.2-python-ipaddress-size.patch b/net-snmp/patches/net-snmp-5.7.2-python-ipaddress-size.patch deleted file mode 100644 index 51a489f..0000000 --- a/net-snmp/patches/net-snmp-5.7.2-python-ipaddress-size.patch +++ /dev/null @@ -1,23 +0,0 @@ -895357 - net-snmp-python adds zeros to end of IP address (IPADDR type), which is not valid - -Source: upstream commit 234158b8e84cc204cbac96e6e9be6959635404b8 - - --- a/python/netsnmp/client_intf.c -+++ a/python/netsnmp/client_intf.c -@@ -821,14 +821,14 @@ OCT: - - case TYPE_IPADDR: - vars->type = ASN_IPADDRESS; -- vars->val.integer = (long *)malloc(sizeof(long)); -+ vars->val.integer = (in_addr_t *)malloc(sizeof(in_addr_t)); - if (val) - *(vars->val.integer) = inet_addr(val); - else { - ret = FAILURE; - *(vars->val.integer) = 0; - } -- vars->val_len = sizeof(long); -+ vars->val_len = sizeof(in_addr_t); - break; - - case TYPE_OBJID: diff --git a/net-snmp/patches/net-snmp-5.7.2-systemd.patch b/net-snmp/patches/net-snmp-5.7.2-systemd.patch index b349097..4c89d60 100644 --- a/net-snmp/patches/net-snmp-5.7.2-systemd.patch +++ b/net-snmp/patches/net-snmp-5.7.2-systemd.patch @@ -57,10 +57,9 @@ Date: Tue Aug 9 10:53:43 2011 +0200 - update WantedBy in socket units as recommended by http://0pointer.de/blog/projects/socket-activation.html - rephrase README.systemd - -diff -up net-snmp-5.7.2/agent/snmpd.c.systemd net-snmp-5.7.2/agent/snmpd.c ---- net-snmp-5.7.2/agent/snmpd.c.systemd 2012-10-10 00:28:58.000000000 +0200 -+++ net-snmp-5.7.2/agent/snmpd.c 2012-11-12 10:18:46.084369548 +0100 +diff -up net-snmp-5.7.3/agent/snmpd.c.MPGqYh net-snmp-5.7.3/agent/snmpd.c +--- net-snmp-5.7.3/agent/snmpd.c.MPGqYh 2014-12-08 21:23:22.000000000 +0100 ++++ net-snmp-5.7.3/agent/snmpd.c 2015-02-17 13:34:05.736221851 +0100 @@ -164,6 +164,10 @@ typedef long fd_mask; #endif @@ -72,7 +71,7 @@ diff -up net-snmp-5.7.2/agent/snmpd.c.systemd net-snmp-5.7.2/agent/snmpd.c netsnmp_feature_want(logging_file) netsnmp_feature_want(logging_stdio) netsnmp_feature_want(logging_syslog) -@@ -441,18 +445,26 @@ main(int argc, char *argv[]) +@@ -443,18 +447,26 @@ main(int argc, char *argv[]) int agent_mode = -1; char *pid_file = NULL; char option_compatability[] = "-Le"; @@ -101,7 +100,7 @@ diff -up net-snmp-5.7.2/agent/snmpd.c.systemd net-snmp-5.7.2/agent/snmpd.c } #endif /* #WIN32 */ -@@ -1100,6 +1112,19 @@ main(int argc, char *argv[]) +@@ -1107,6 +1119,19 @@ main(int argc, char *argv[]) netsnmp_addrcache_initialise(); /* @@ -121,9 +120,9 @@ diff -up net-snmp-5.7.2/agent/snmpd.c.systemd net-snmp-5.7.2/agent/snmpd.c * Forever monitor the dest_port for incoming PDUs. */ DEBUGMSGTL(("snmpd/main", "We're up. Starting to process data.\n")); -diff -up net-snmp-5.7.2/apps/snmptrapd.c.systemd net-snmp-5.7.2/apps/snmptrapd.c ---- net-snmp-5.7.2/apps/snmptrapd.c.systemd 2012-10-10 00:28:58.000000000 +0200 -+++ net-snmp-5.7.2/apps/snmptrapd.c 2012-11-12 10:18:46.084369548 +0100 +diff -up net-snmp-5.7.3/apps/snmptrapd.c.MPGqYh net-snmp-5.7.3/apps/snmptrapd.c +--- net-snmp-5.7.3/apps/snmptrapd.c.MPGqYh 2014-12-08 21:23:22.000000000 +0100 ++++ net-snmp-5.7.3/apps/snmptrapd.c 2015-02-17 13:34:05.736221851 +0100 @@ -125,6 +125,10 @@ SOFTWARE. #include <net-snmp/net-snmp-features.h> @@ -135,7 +134,7 @@ diff -up net-snmp-5.7.2/apps/snmptrapd.c.systemd net-snmp-5.7.2/apps/snmptrapd.c #ifndef BSD4_3 #define BSD4_2 #endif -@@ -655,15 +659,22 @@ main(int argc, char *argv[]) +@@ -657,15 +661,22 @@ main(int argc, char *argv[]) int agentx_subagent = 1; #endif netsnmp_trapd_handler *traph; @@ -160,7 +159,7 @@ diff -up net-snmp-5.7.2/apps/snmptrapd.c.systemd net-snmp-5.7.2/apps/snmptrapd.c } #endif /* #WIN32 */ -@@ -1311,6 +1322,19 @@ main(int argc, char *argv[]) +@@ -1318,6 +1329,19 @@ main(int argc, char *argv[]) #endif #endif @@ -180,9 +179,9 @@ diff -up net-snmp-5.7.2/apps/snmptrapd.c.systemd net-snmp-5.7.2/apps/snmptrapd.c #ifdef WIN32SERVICE trapd_status = SNMPTRAPD_RUNNING; #endif -diff -up net-snmp-5.7.2/configure.d/config_modules_lib.systemd net-snmp-5.7.2/configure.d/config_modules_lib ---- net-snmp-5.7.2/configure.d/config_modules_lib.systemd 2012-10-10 00:28:58.000000000 +0200 -+++ net-snmp-5.7.2/configure.d/config_modules_lib 2012-11-12 10:18:46.085369546 +0100 +diff -up net-snmp-5.7.3/configure.d/config_modules_lib.MPGqYh net-snmp-5.7.3/configure.d/config_modules_lib +--- net-snmp-5.7.3/configure.d/config_modules_lib.MPGqYh 2014-12-08 21:23:22.000000000 +0100 ++++ net-snmp-5.7.3/configure.d/config_modules_lib 2015-02-17 13:34:05.737221850 +0100 @@ -53,6 +53,14 @@ if test "x$PARTIALTARGETOS" = "xmingw32" other_ftobjs_list="$other_ftobjs_list winpipe.ft" fi @@ -198,9 +197,9 @@ diff -up net-snmp-5.7.2/configure.d/config_modules_lib.systemd net-snmp-5.7.2/co AC_SUBST(other_src_list) AC_SUBST(other_objs_list) AC_SUBST(other_lobjs_list) -diff -up net-snmp-5.7.2/configure.d/config_project_with_enable.systemd net-snmp-5.7.2/configure.d/config_project_with_enable ---- net-snmp-5.7.2/configure.d/config_project_with_enable.systemd 2012-10-10 00:28:58.000000000 +0200 -+++ net-snmp-5.7.2/configure.d/config_project_with_enable 2012-11-12 10:18:46.086369544 +0100 +diff -up net-snmp-5.7.3/configure.d/config_project_with_enable.MPGqYh net-snmp-5.7.3/configure.d/config_project_with_enable +--- net-snmp-5.7.3/configure.d/config_project_with_enable.MPGqYh 2014-12-08 21:23:22.000000000 +0100 ++++ net-snmp-5.7.3/configure.d/config_project_with_enable 2015-02-17 13:34:05.737221850 +0100 @@ -690,6 +690,15 @@ if test "x$with_dummy_values" != "xyes"; data for]) fi @@ -217,10 +216,10 @@ diff -up net-snmp-5.7.2/configure.d/config_project_with_enable.systemd net-snmp- NETSNMP_ARG_ENABLE(set-support, [ --disable-set-support Do not allow SNMP set requests.]) if test "x$enable_set_support" = "xno"; then -diff -up net-snmp-5.7.2/configure.systemd net-snmp-5.7.2/configure ---- net-snmp-5.7.2/configure.systemd 2012-10-10 00:35:37.000000000 +0200 -+++ net-snmp-5.7.2/configure 2012-11-12 10:18:46.099369517 +0100 -@@ -950,6 +950,8 @@ with_kmem_usage +diff -up net-snmp-5.7.3/configure.MPGqYh net-snmp-5.7.3/configure +--- net-snmp-5.7.3/configure.MPGqYh 2014-12-08 21:23:37.000000000 +0100 ++++ net-snmp-5.7.3/configure 2015-02-17 13:34:05.744221845 +0100 +@@ -951,6 +951,8 @@ with_kmem_usage enable_kmem_usage with_dummy_values enable_dummy_values @@ -229,7 +228,7 @@ diff -up net-snmp-5.7.2/configure.systemd net-snmp-5.7.2/configure enable_set_support with_set_support with_sys_contact -@@ -1866,6 +1868,8 @@ Configuring the agent: +@@ -1867,6 +1869,8 @@ Configuring the agent: This is technically not compliant with the SNMP specifications, but was how the agent operated for versions < 4.0. @@ -238,7 +237,7 @@ diff -up net-snmp-5.7.2/configure.systemd net-snmp-5.7.2/configure --with-sys-contact="who@where" Default system contact. (Default: LOGIN@DOMAINNAME) --with-sys-location="location" Default system location. -@@ -4397,6 +4401,24 @@ $as_echo "#define NETSNMP_NO_DUMMY_VALUE +@@ -4398,6 +4402,24 @@ $as_echo "#define NETSNMP_NO_DUMMY_VALUE fi @@ -263,7 +262,7 @@ diff -up net-snmp-5.7.2/configure.systemd net-snmp-5.7.2/configure # Check whether --enable-set-support was given. if test "${enable_set_support+set}" = set; then : enableval=$enable_set_support; -@@ -18239,6 +18261,14 @@ if test "x$PARTIALTARGETOS" = "xmingw32" +@@ -18639,6 +18661,14 @@ if test "x$PARTIALTARGETOS" = "xmingw32" other_ftobjs_list="$other_ftobjs_list winpipe.ft" fi @@ -278,9 +277,9 @@ diff -up net-snmp-5.7.2/configure.systemd net-snmp-5.7.2/configure -diff -up net-snmp-5.7.2/dist/snmpd.service.systemd net-snmp-5.7.2/dist/snmpd.service ---- net-snmp-5.7.2/dist/snmpd.service.systemd 2012-11-12 10:18:46.104369507 +0100 -+++ net-snmp-5.7.2/dist/snmpd.service 2012-11-12 10:18:46.104369507 +0100 +diff -up net-snmp-5.7.3/dist/snmpd.service.MPGqYh net-snmp-5.7.3/dist/snmpd.service +--- net-snmp-5.7.3/dist/snmpd.service.MPGqYh 2015-02-17 13:34:05.745221844 +0100 ++++ net-snmp-5.7.3/dist/snmpd.service 2015-02-17 13:34:05.745221844 +0100 @@ -0,0 +1,18 @@ +# +# SNMP agent service file for systemd @@ -300,9 +299,9 @@ diff -up net-snmp-5.7.2/dist/snmpd.service.systemd net-snmp-5.7.2/dist/snmpd.ser + +[Install] +WantedBy=multi-user.target -diff -up net-snmp-5.7.2/dist/snmpd.socket.systemd net-snmp-5.7.2/dist/snmpd.socket ---- net-snmp-5.7.2/dist/snmpd.socket.systemd 2012-11-12 10:18:46.104369507 +0100 -+++ net-snmp-5.7.2/dist/snmpd.socket 2012-11-12 10:18:46.104369507 +0100 +diff -up net-snmp-5.7.3/dist/snmpd.socket.MPGqYh net-snmp-5.7.3/dist/snmpd.socket +--- net-snmp-5.7.3/dist/snmpd.socket.MPGqYh 2015-02-17 13:34:05.745221844 +0100 ++++ net-snmp-5.7.3/dist/snmpd.socket 2015-02-17 13:34:05.745221844 +0100 @@ -0,0 +1,17 @@ +[Unit] +Description=Socket listening for SNMP and AgentX messages @@ -321,9 +320,9 @@ diff -up net-snmp-5.7.2/dist/snmpd.socket.systemd net-snmp-5.7.2/dist/snmpd.sock + +[Install] +WantedBy=sockets.target -diff -up net-snmp-5.7.2/dist/snmptrapd.service.systemd net-snmp-5.7.2/dist/snmptrapd.service ---- net-snmp-5.7.2/dist/snmptrapd.service.systemd 2012-11-12 10:18:46.105369505 +0100 -+++ net-snmp-5.7.2/dist/snmptrapd.service 2012-11-12 10:18:46.105369505 +0100 +diff -up net-snmp-5.7.3/dist/snmptrapd.service.MPGqYh net-snmp-5.7.3/dist/snmptrapd.service +--- net-snmp-5.7.3/dist/snmptrapd.service.MPGqYh 2015-02-17 13:34:05.745221844 +0100 ++++ net-snmp-5.7.3/dist/snmptrapd.service 2015-02-17 13:34:05.745221844 +0100 @@ -0,0 +1,16 @@ +# +# SNMP trap-processing service file for systemd @@ -341,9 +340,9 @@ diff -up net-snmp-5.7.2/dist/snmptrapd.service.systemd net-snmp-5.7.2/dist/snmpt + +[Install] +WantedBy=multi-user.target -diff -up net-snmp-5.7.2/dist/snmptrapd.socket.systemd net-snmp-5.7.2/dist/snmptrapd.socket ---- net-snmp-5.7.2/dist/snmptrapd.socket.systemd 2012-11-12 10:18:46.105369505 +0100 -+++ net-snmp-5.7.2/dist/snmptrapd.socket 2012-11-12 10:18:46.105369505 +0100 +diff -up net-snmp-5.7.3/dist/snmptrapd.socket.MPGqYh net-snmp-5.7.3/dist/snmptrapd.socket +--- net-snmp-5.7.3/dist/snmptrapd.socket.MPGqYh 2015-02-17 13:34:05.745221844 +0100 ++++ net-snmp-5.7.3/dist/snmptrapd.socket 2015-02-17 13:34:05.745221844 +0100 @@ -0,0 +1,14 @@ +[Unit] +Description=Socket listening for SNMP trap messages @@ -359,9 +358,9 @@ diff -up net-snmp-5.7.2/dist/snmptrapd.socket.systemd net-snmp-5.7.2/dist/snmptr + +[Install] +WantedBy=sockets.target -diff -up net-snmp-5.7.2/include/net-snmp/library/sd-daemon.h.systemd net-snmp-5.7.2/include/net-snmp/library/sd-daemon.h ---- net-snmp-5.7.2/include/net-snmp/library/sd-daemon.h.systemd 2012-11-12 10:18:46.106369503 +0100 -+++ net-snmp-5.7.2/include/net-snmp/library/sd-daemon.h 2012-11-12 10:18:46.106369503 +0100 +diff -up net-snmp-5.7.3/include/net-snmp/library/sd-daemon.h.MPGqYh net-snmp-5.7.3/include/net-snmp/library/sd-daemon.h +--- net-snmp-5.7.3/include/net-snmp/library/sd-daemon.h.MPGqYh 2015-02-17 13:34:05.746221843 +0100 ++++ net-snmp-5.7.3/include/net-snmp/library/sd-daemon.h 2015-02-17 13:34:05.746221843 +0100 @@ -0,0 +1,286 @@ +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ + @@ -649,10 +648,10 @@ diff -up net-snmp-5.7.2/include/net-snmp/library/sd-daemon.h.systemd net-snmp-5. +#endif + +#endif /* SNMPD_SD_DAEMON_H */ -diff -up net-snmp-5.7.2/include/net-snmp/net-snmp-config.h.in.systemd net-snmp-5.7.2/include/net-snmp/net-snmp-config.h.in ---- net-snmp-5.7.2/include/net-snmp/net-snmp-config.h.in.systemd 2012-10-10 00:28:58.000000000 +0200 -+++ net-snmp-5.7.2/include/net-snmp/net-snmp-config.h.in 2012-11-12 10:18:46.107369501 +0100 -@@ -1389,6 +1389,9 @@ +diff -up net-snmp-5.7.3/include/net-snmp/net-snmp-config.h.in.MPGqYh net-snmp-5.7.3/include/net-snmp/net-snmp-config.h.in +--- net-snmp-5.7.3/include/net-snmp/net-snmp-config.h.in.MPGqYh 2014-12-08 21:23:22.000000000 +0100 ++++ net-snmp-5.7.3/include/net-snmp/net-snmp-config.h.in 2015-02-17 13:34:05.746221843 +0100 +@@ -1410,6 +1410,9 @@ /* If you don't have root access don't exit upon kmem errors */ #undef NETSNMP_NO_ROOT_ACCESS @@ -662,9 +661,9 @@ diff -up net-snmp-5.7.2/include/net-snmp/net-snmp-config.h.in.systemd net-snmp-5 /* Define if you want to remove all SET/write access from the code */ #undef NETSNMP_NO_WRITE_SUPPORT -diff -up net-snmp-5.7.2/README.systemd.systemd net-snmp-5.7.2/README.systemd ---- net-snmp-5.7.2/README.systemd.systemd 2012-11-12 10:18:46.108369499 +0100 -+++ net-snmp-5.7.2/README.systemd 2012-11-12 10:18:46.108369499 +0100 +diff -up net-snmp-5.7.3/README.systemd.MPGqYh net-snmp-5.7.3/README.systemd +--- net-snmp-5.7.3/README.systemd.MPGqYh 2015-02-17 13:34:05.747221843 +0100 ++++ net-snmp-5.7.3/README.systemd 2015-02-17 13:34:05.747221843 +0100 @@ -0,0 +1,41 @@ +README.systemd +-------------- @@ -708,9 +707,9 @@ diff -up net-snmp-5.7.2/README.systemd.systemd net-snmp-5.7.2/README.systemd +start during boot and not after first SNMP trap arrives. Same rules as for snmpd +applies then. \ No newline at end of file -diff -up net-snmp-5.7.2/snmplib/sd-daemon.c.systemd net-snmp-5.7.2/snmplib/sd-daemon.c ---- net-snmp-5.7.2/snmplib/sd-daemon.c.systemd 2012-11-12 10:18:46.109369497 +0100 -+++ net-snmp-5.7.2/snmplib/sd-daemon.c 2012-11-12 10:18:46.109369497 +0100 +diff -up net-snmp-5.7.3/snmplib/sd-daemon.c.MPGqYh net-snmp-5.7.3/snmplib/sd-daemon.c +--- net-snmp-5.7.3/snmplib/sd-daemon.c.MPGqYh 2015-02-17 13:34:05.747221843 +0100 ++++ net-snmp-5.7.3/snmplib/sd-daemon.c 2015-02-17 13:34:05.747221843 +0100 @@ -0,0 +1,532 @@ +/* + * Systemd integration parts. @@ -1244,9 +1243,9 @@ diff -up net-snmp-5.7.2/snmplib/sd-daemon.c.systemd net-snmp-5.7.2/snmplib/sd-da +} + +#endif /* ! NETSNMP_NO_SYSTEMD */ -diff -up net-snmp-5.7.2/snmplib/transports/snmpTCPDomain.c.systemd net-snmp-5.7.2/snmplib/transports/snmpTCPDomain.c ---- net-snmp-5.7.2/snmplib/transports/snmpTCPDomain.c.systemd 2012-10-10 00:28:58.000000000 +0200 -+++ net-snmp-5.7.2/snmplib/transports/snmpTCPDomain.c 2012-11-12 10:19:41.767217067 +0100 +diff -up net-snmp-5.7.3/snmplib/transports/snmpTCPDomain.c.MPGqYh net-snmp-5.7.3/snmplib/transports/snmpTCPDomain.c +--- net-snmp-5.7.3/snmplib/transports/snmpTCPDomain.c.MPGqYh 2014-12-08 21:23:22.000000000 +0100 ++++ net-snmp-5.7.3/snmplib/transports/snmpTCPDomain.c 2015-02-17 13:34:05.748221842 +0100 @@ -43,6 +43,10 @@ #include <net-snmp/library/snmpTCPBaseDomain.h> #include <net-snmp/library/tools.h> @@ -1326,9 +1325,9 @@ diff -up net-snmp-5.7.2/snmplib/transports/snmpTCPDomain.c.systemd net-snmp-5.7. } /* -diff -up net-snmp-5.7.2/snmplib/transports/snmpTCPIPv6Domain.c.systemd net-snmp-5.7.2/snmplib/transports/snmpTCPIPv6Domain.c ---- net-snmp-5.7.2/snmplib/transports/snmpTCPIPv6Domain.c.systemd 2012-10-10 00:28:58.000000000 +0200 -+++ net-snmp-5.7.2/snmplib/transports/snmpTCPIPv6Domain.c 2012-11-12 10:20:32.019078971 +0100 +diff -up net-snmp-5.7.3/snmplib/transports/snmpTCPIPv6Domain.c.MPGqYh net-snmp-5.7.3/snmplib/transports/snmpTCPIPv6Domain.c +--- net-snmp-5.7.3/snmplib/transports/snmpTCPIPv6Domain.c.MPGqYh 2014-12-08 21:23:22.000000000 +0100 ++++ net-snmp-5.7.3/snmplib/transports/snmpTCPIPv6Domain.c 2015-02-17 13:34:05.748221842 +0100 @@ -49,6 +49,10 @@ #include <net-snmp/library/snmpTCPBaseDomain.h> #include <net-snmp/library/tools.h> @@ -1409,9 +1408,9 @@ diff -up net-snmp-5.7.2/snmplib/transports/snmpTCPIPv6Domain.c.systemd net-snmp- } /* -diff -up net-snmp-5.7.2/snmplib/transports/snmpUDPIPv4BaseDomain.c.systemd net-snmp-5.7.2/snmplib/transports/snmpUDPIPv4BaseDomain.c ---- net-snmp-5.7.2/snmplib/transports/snmpUDPIPv4BaseDomain.c.systemd 2012-10-10 00:28:58.000000000 +0200 -+++ net-snmp-5.7.2/snmplib/transports/snmpUDPIPv4BaseDomain.c 2012-11-12 10:22:30.279750750 +0100 +diff -up net-snmp-5.7.3/snmplib/transports/snmpUDPIPv4BaseDomain.c.MPGqYh net-snmp-5.7.3/snmplib/transports/snmpUDPIPv4BaseDomain.c +--- net-snmp-5.7.3/snmplib/transports/snmpUDPIPv4BaseDomain.c.MPGqYh 2014-12-08 21:23:22.000000000 +0100 ++++ net-snmp-5.7.3/snmplib/transports/snmpUDPIPv4BaseDomain.c 2015-02-17 13:36:22.744123462 +0100 @@ -40,6 +40,10 @@ #include <net-snmp/library/snmpSocketBaseDomain.h> @@ -1420,10 +1419,10 @@ diff -up net-snmp-5.7.2/snmplib/transports/snmpUDPIPv4BaseDomain.c.systemd net-s +#include <net-snmp/library/sd-daemon.h> +#endif + - #if (defined(linux) && defined(IP_PKTINFO)) \ - || defined(IP_RECVDSTADDR) && HAVE_STRUCT_MSGHDR_MSG_CONTROL \ - && HAVE_STRUCT_MSGHDR_MSG_FLAGS -@@ -67,6 +71,7 @@ netsnmp_udpipv4base_transport(struct soc + #if defined(HAVE_IP_PKTINFO) || defined(HAVE_IP_RECVDSTADDR) + int netsnmp_udpipv4_recvfrom(int s, void *buf, int len, struct sockaddr *from, + socklen_t *fromlen, struct sockaddr *dstip, +@@ -64,6 +68,7 @@ netsnmp_udpipv4base_transport(struct soc char *client_socket = NULL; netsnmp_indexed_addr_pair addr_pair; socklen_t local_addr_len; @@ -1431,7 +1430,7 @@ diff -up net-snmp-5.7.2/snmplib/transports/snmpUDPIPv4BaseDomain.c.systemd net-s #ifdef NETSNMP_NO_LISTEN_SUPPORT if (local) -@@ -91,7 +96,20 @@ netsnmp_udpipv4base_transport(struct soc +@@ -88,7 +93,20 @@ netsnmp_udpipv4base_transport(struct soc free(str); } @@ -1453,17 +1452,16 @@ diff -up net-snmp-5.7.2/snmplib/transports/snmpUDPIPv4BaseDomain.c.systemd net-s DEBUGMSGTL(("UDPBase", "openned socket %d as local=%d\n", t->sock, local)); if (t->sock < 0) { netsnmp_transport_free(t); -@@ -141,13 +159,15 @@ netsnmp_udpipv4base_transport(struct soc - DEBUGMSGTL(("netsnmp_udp", "set IP_RECVDSTADDR\n")); +@@ -151,12 +169,14 @@ netsnmp_udpipv4base_transport(struct soc + } } - #endif + #endif /* !defined(WIN32) */ - rc = bind(t->sock, (struct sockaddr *) addr, - sizeof(struct sockaddr)); - if (rc != 0) { - netsnmp_socketbase_close(t); - netsnmp_transport_free(t); - return NULL; -- } + if (!socket_initialized) { + rc = bind(t->sock, (struct sockaddr *) addr, + sizeof(struct sockaddr)); @@ -1472,13 +1470,12 @@ diff -up net-snmp-5.7.2/snmplib/transports/snmpUDPIPv4BaseDomain.c.systemd net-s + netsnmp_transport_free(t); + return NULL; + } -+ } + } t->data = NULL; t->data_length = 0; - #else /* NETSNMP_NO_LISTEN_SUPPORT */ -diff -up net-snmp-5.7.2/snmplib/transports/snmpUDPIPv6Domain.c.systemd net-snmp-5.7.2/snmplib/transports/snmpUDPIPv6Domain.c ---- net-snmp-5.7.2/snmplib/transports/snmpUDPIPv6Domain.c.systemd 2012-10-10 00:28:58.000000000 +0200 -+++ net-snmp-5.7.2/snmplib/transports/snmpUDPIPv6Domain.c 2012-11-12 10:23:19.713603003 +0100 +diff -up net-snmp-5.7.3/snmplib/transports/snmpUDPIPv6Domain.c.MPGqYh net-snmp-5.7.3/snmplib/transports/snmpUDPIPv6Domain.c +--- net-snmp-5.7.3/snmplib/transports/snmpUDPIPv6Domain.c.MPGqYh 2014-12-08 21:23:22.000000000 +0100 ++++ net-snmp-5.7.3/snmplib/transports/snmpUDPIPv6Domain.c 2015-02-17 13:37:16.256087147 +0100 @@ -67,6 +67,10 @@ static const struct in6_addr in6addr_any #include <net-snmp/library/snmpSocketBaseDomain.h> #include <net-snmp/library/tools.h> @@ -1520,8 +1517,8 @@ diff -up net-snmp-5.7.2/snmplib/transports/snmpUDPIPv6Domain.c.systemd net-snmp- netsnmp_transport_free(t); return NULL; @@ -242,13 +259,14 @@ netsnmp_udp6_transport(struct sockaddr_i - } - } + } + } #endif - - rc = bind(t->sock, (struct sockaddr *) addr, @@ -1541,9 +1538,9 @@ diff -up net-snmp-5.7.2/snmplib/transports/snmpUDPIPv6Domain.c.systemd net-snmp- } t->local = (unsigned char*)malloc(18); if (t->local == NULL) { -diff -up net-snmp-5.7.2/snmplib/transports/snmpUnixDomain.c.systemd net-snmp-5.7.2/snmplib/transports/snmpUnixDomain.c ---- net-snmp-5.7.2/snmplib/transports/snmpUnixDomain.c.systemd 2012-10-10 00:28:58.000000000 +0200 -+++ net-snmp-5.7.2/snmplib/transports/snmpUnixDomain.c 2012-11-12 10:24:02.803466358 +0100 +diff -up net-snmp-5.7.3/snmplib/transports/snmpUnixDomain.c.MPGqYh net-snmp-5.7.3/snmplib/transports/snmpUnixDomain.c +--- net-snmp-5.7.3/snmplib/transports/snmpUnixDomain.c.MPGqYh 2014-12-08 21:23:22.000000000 +0100 ++++ net-snmp-5.7.3/snmplib/transports/snmpUnixDomain.c 2015-02-17 13:34:05.749221841 +0100 @@ -37,6 +37,10 @@ #include <net-snmp/library/system.h> /* mkdirhier */ #include <net-snmp/library/tools.h> diff --git a/ntp/ntp.nm b/ntp/ntp.nm index 7f8f171..a82920c 100644 --- a/ntp/ntp.nm +++ b/ntp/ntp.nm @@ -6,7 +6,7 @@ name = ntp version = %{ver_major}.8 ver_major = 4.2 -release = 3 +release = 4 groups = System/Daemons url = http://www.ntp.org/ @@ -43,7 +43,8 @@ build --sysconfdir=%{sysconfdir}/ntp/crypto \ --enable-all-clocks \ --enable-parse-clocks \ - --enable-ntp-signd=%{localstatedir}/run/ntp_signd + --enable-ntp-signd=%{localstatedir}/run/ntp_signd \ + --without-rpath make_install_targets += bindir=%{sbindir} hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 6ef6281c6c1432aefe17d3b9886da57c92203ed1
by git＠ipfire.org 12 Jan '17

12 Jan '17

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 3.x development tree". The branch, master has been updated via 6ef6281c6c1432aefe17d3b9886da57c92203ed1 (commit) from 10ae0bfa546c861ebcda815aca96bd681cbc1892 (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 6ef6281c6c1432aefe17d3b9886da57c92203ed1 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Wed Oct 26 10:40:28 2016 +0200 net-tools: Drop SELinux support. Fixes #11217. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: net-tools/config.make | 2 +- net-tools/net-tools.nm | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) Difference in files: diff --git a/net-tools/config.make b/net-tools/config.make index 5cde36b..18907a5 100644 --- a/net-tools/config.make +++ b/net-tools/config.make @@ -34,4 +34,4 @@ HAVE_HWIB=1 HAVE_FW_MASQUERADE=1 HAVE_IP_TOOLS=1 HAVE_MII=1 -HAVE_SELINUX=1 +HAVE_SELINUX=0 diff --git a/net-tools/net-tools.nm b/net-tools/net-tools.nm index fa61d05..24ae372 100644 --- a/net-tools/net-tools.nm +++ b/net-tools/net-tools.nm @@ -6,7 +6,7 @@ name = net-tools version = 2.0 git_rev = e5f1be13 -release = 1.%{git_rev} +release = 2.%{git_rev} groups = System/Base url = http://net-tools.berlios.de/ @@ -24,7 +24,6 @@ sources = %{thisapp}-%{git_rev}.tar.xz build requires gettext - libselinux-devel end prepare_cmds hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 10ae0bfa546c861ebcda815aca96bd681cbc1892
by git＠ipfire.org 12 Jan '17

12 Jan '17

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. ed91d763e6851923d5d5e3b044776ae7194ac2b8
by git＠ipfire.org 11 Jan '17

11 Jan '17

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 ed91d763e6851923d5d5e3b044776ae7194ac2b8 (commit) via 3713af1e276dfb167abf29783ee85a64e865e845 (commit) via 8f23ce8e53d5b016cbb05e24566739983c89894a (commit) via ff6cc71107ae50e913c87a9bc77b3af4b31ec932 (commit) via 4f857eea41e1e5cce0bd7a48f1e0d6bafc33cb7e (commit) from 00d2007b040fdddd3455e4172bb7a19409d95ca2 (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 ed91d763e6851923d5d5e3b044776ae7194ac2b8 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jan 11 17:21:46 2017 +0000 core109: Ship recently updated perl files Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 3713af1e276dfb167abf29783ee85a64e865e845 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jan 11 17:18:46 2017 +0000 network-functions.pl: Add tests for the new equals function Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 8f23ce8e53d5b016cbb05e24566739983c89894a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jan 11 17:09:42 2017 +0000 network-functions.pl: Fix code formatting Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit ff6cc71107ae50e913c87a9bc77b3af4b31ec932 Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Tue Jan 10 15:13:58 2017 +0100 BUG11278: enable creation from subnets of internal networks In firewallgroups it was not possible to create new networks that are subnets of IPFire internal networks. Now this is possible for all internal networks. Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 4f857eea41e1e5cce0bd7a48f1e0d6bafc33cb7e Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Tue Jan 10 14:12:27 2017 +0100 BUG11278: Cleanup function for network check Deleted some code which is also used in another function Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/cfgroot/general-functions.pl | 18 +++++++----------- config/cfgroot/network-functions.pl | 30 ++++++++++++++++++++++++++++++ config/rootfiles/core/109/filelists/files | 2 ++ 3 files changed, 39 insertions(+), 11 deletions(-) Difference in files: diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl index 298e68c..081e4e3 100644 --- a/config/cfgroot/general-functions.pl +++ b/config/cfgroot/general-functions.pl @@ -540,13 +540,9 @@ sub checksubnets return $errormessage; } } - - #check if we use one of ipfire's networks (green,orange,blue) - &readhash("${General::swroot}/ethernet/settings", \%ownnet); - if (($ownnet{'GREEN_NETADDRESS'} ne '' && $ownnet{'GREEN_NETADDRESS'} ne '0.0.0.0') && &IpInSubnet($ip,$ownnet{'GREEN_NETADDRESS'},&iporsubtodec($ownnet{'GREEN_NETMASK'}))){ $errormessage=$Lang::tr{'ccd err green'};return $errormessage;} - if (($ownnet{'ORANGE_NETADDRESS'} ne '' && $ownnet{'ORANGE_NETADDRESS'} ne '0.0.0.0') && &IpInSubnet($ip,$ownnet{'ORANGE_NETADDRESS'},&iporsubtodec($ownnet{'ORANGE_NETMASK'}))){ $errormessage=$Lang::tr{'ccd err orange'};return $errormessage;} - if (($ownnet{'BLUE_NETADDRESS'} ne '' && $ownnet{'BLUE_NETADDRESS'} ne '0.0.0.0') && &IpInSubnet($ip,$ownnet{'BLUE_NETADDRESS'},&iporsubtodec($ownnet{'BLUE_NETMASK'}))){ $errormessage=$Lang::tr{'ccd err blue'};return $errormessage;} - if (($ownnet{'RED_NETADDRESS'} ne '' && $ownnet{'RED_NETADDRESS'} ne '0.0.0.0') && &IpInSubnet($ip,$ownnet{'RED_NETADDRESS'},&iporsubtodec($ownnet{'RED_NETMASK'}))){ $errormessage=$Lang::tr{'ccd err red'};return $errormessage;} + + #call check_net_internal + &General::check_net_internal($ccdnet); } sub check_net_internal{ @@ -557,10 +553,10 @@ sub check_net_internal{ $cidr=&iporsubtocidr($cidr); #check if we use one of ipfire's networks (green,orange,blue) &readhash("${General::swroot}/ethernet/settings", \%ownnet); - if (($ownnet{'GREEN_NETADDRESS'} ne '' && $ownnet{'GREEN_NETADDRESS'} ne '0.0.0.0') && &IpInSubnet($ip,$ownnet{'GREEN_NETADDRESS'},&iporsubtodec($ownnet{'GREEN_NETMASK'}))){ $errormessage=$Lang::tr{'ccd err green'};return $errormessage;} - if (($ownnet{'ORANGE_NETADDRESS'} ne '' && $ownnet{'ORANGE_NETADDRESS'} ne '0.0.0.0') && &IpInSubnet($ip,$ownnet{'ORANGE_NETADDRESS'},&iporsubtodec($ownnet{'ORANGE_NETMASK'}))){ $errormessage=$Lang::tr{'ccd err orange'};return $errormessage;} - if (($ownnet{'BLUE_NETADDRESS'} ne '' && $ownnet{'BLUE_NETADDRESS'} ne '0.0.0.0') && &IpInSubnet($ip,$ownnet{'BLUE_NETADDRESS'},&iporsubtodec($ownnet{'BLUE_NETMASK'}))){ $errormessage=$Lang::tr{'ccd err blue'};return $errormessage;} - if (($ownnet{'RED_NETADDRESS'} ne '' && $ownnet{'RED_NETADDRESS'} ne '0.0.0.0') && &IpInSubnet($ip,$ownnet{'RED_NETADDRESS'},&iporsubtodec($ownnet{'RED_NETMASK'}))){ $errormessage=$Lang::tr{'ccd err red'};return $errormessage;} + if (($ownnet{'GREEN_NETADDRESS'} ne '' && $ownnet{'GREEN_NETADDRESS'} ne '0.0.0.0') && &Network::network_equal("$ownnet{'GREEN_NETADDRESS'}/$ownnet{'GREEN_NETMASK'}",$network)){ $errormessage=$Lang::tr{'ccd err green'};return $errormessage;} + if (($ownnet{'ORANGE_NETADDRESS'} ne '' && $ownnet{'ORANGE_NETADDRESS'} ne '0.0.0.0') && &Network::network_equal("$ownnet{'ORANGE_NETADDRESS'}/$ownnet{'ORANGE_NETMASK'}",$network)){ $errormessage=$Lang::tr{'ccd err orange'};return $errormessage;} + if (($ownnet{'BLUE_NETADDRESS'} ne '' && $ownnet{'BLUE_NETADDRESS'} ne '0.0.0.0') && &Network::network_equal("$ownnet{'BLUE_NETADDRESS'}/$ownnet{'BLUE_NETMASK'}",$network)){ $errormessage=$Lang::tr{'ccd err blue'};return $errormessage;} + if (($ownnet{'RED_NETADDRESS'} ne '' && $ownnet{'RED_NETADDRESS'} ne '0.0.0.0') && &Network::network_equal("$ownnet{'RED_NETADDRESS'}/$ownnet{'RED_NETMASK'}",$network)){ $errormessage=$Lang::tr{'ccd err red'};return $errormessage;} } sub validport diff --git a/config/cfgroot/network-functions.pl b/config/cfgroot/network-functions.pl index 70fa5ed..5f53704 100644 --- a/config/cfgroot/network-functions.pl +++ b/config/cfgroot/network-functions.pl @@ -102,6 +102,22 @@ sub bin2ip($) { return $address; } +# Takes two network addresses, compares them against each other +# and returns true if equal or false if not +sub network_equal { + my $network1 = shift; + my $network2 = shift; + + my $bin1 = &network2bin($network1); + my $bin2 = &network2bin($network2); + + if ($bin1 eq $bin2) { + return 1; + } + + return 0; +} + # Takes a network in either a.b.c.d/a.b.c.d or a.b.c.d/e notation # and will return an 32 bit integer representing the start # address and an other one representing the network mask. @@ -352,12 +368,26 @@ sub testsuite() { $result = &find_next_ip_address("1.2.3.4", 2); assert($result eq "1.2.3.6"); + $result = &network_equal("192.168.0.0/24", "192.168.0.0/255.255.255.0"); + assert($result); + + $result = &network_equal("192.168.0.0/24", "192.168.0.0/25"); + assert(!$result); + + $result = &network_equal("192.168.0.0/24", "192.168.0.128/25"); + assert(!$result); + + $result = &network_equal("192.168.0.1/24", "192.168.0.XXX/24"); + assert($result); + $result = &ip_address_in_network("10.0.1.4", "10.0.0.0/8"); assert($result); $result = &ip_address_in_network("192.168.30.11", "192.168.30.0/255.255.255.0"); assert($result); + print "Testsuite completed successfully!\n"; + return 0; } diff --git a/config/rootfiles/core/109/filelists/files b/config/rootfiles/core/109/filelists/files index 182b816..0d5de8f 100644 --- a/config/rootfiles/core/109/filelists/files +++ b/config/rootfiles/core/109/filelists/files @@ -5,3 +5,5 @@ lib/udev/network-hotplug-bridges lib/udev/network-hotplug-rename usr/local/bin/backupiso usr/local/bin/syslogdctrl +var/ipfire/general-functions.pl +var/ipfire/network-functions.pl hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 00d2007b040fdddd3455e4172bb7a19409d95ca2
by git＠ipfire.org 09 Jan '17

09 Jan '17

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 00d2007b040fdddd3455e4172bb7a19409d95ca2 (commit) from 544cc6c7259ca8de4dbf5686bb9b896ccfcd69c6 (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 00d2007b040fdddd3455e4172bb7a19409d95ca2 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Jan 9 18:09:43 2017 +0100 strongswan: fix rootfile (padlock) Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/strongswan | 3 +++ 1 file changed, 3 insertions(+) Difference in files: diff --git a/config/rootfiles/common/strongswan b/config/rootfiles/common/strongswan index 38da986..354ecd7 100644 --- a/config/rootfiles/common/strongswan +++ b/config/rootfiles/common/strongswan @@ -40,6 +40,7 @@ etc/strongswan.d/charon/kernel-netlink.conf etc/strongswan.d/charon/md5.conf etc/strongswan.d/charon/nonce.conf etc/strongswan.d/charon/openssl.conf +#etc/strongswan.d/charon/padlock.conf etc/strongswan.d/charon/pem.conf etc/strongswan.d/charon/pgp.conf etc/strongswan.d/charon/pkcs1.conf @@ -136,6 +137,7 @@ usr/lib/ipsec/plugins/libstrongswan-kernel-netlink.so usr/lib/ipsec/plugins/libstrongswan-md5.so usr/lib/ipsec/plugins/libstrongswan-nonce.so usr/lib/ipsec/plugins/libstrongswan-openssl.so +#usr/lib/ipsec/plugins/libstrongswan-padlock.so usr/lib/ipsec/plugins/libstrongswan-pem.so usr/lib/ipsec/plugins/libstrongswan-pgp.so usr/lib/ipsec/plugins/libstrongswan-pkcs1.so @@ -218,6 +220,7 @@ usr/sbin/swanctl #usr/share/strongswan/templates/config/plugins/md5.conf #usr/share/strongswan/templates/config/plugins/nonce.conf #usr/share/strongswan/templates/config/plugins/openssl.conf +#usr/share/strongswan/templates/config/plugins/padlock.conf #usr/share/strongswan/templates/config/plugins/pem.conf #usr/share/strongswan/templates/config/plugins/pgp.conf #usr/share/strongswan/templates/config/plugins/pkcs1.conf hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 544cc6c7259ca8de4dbf5686bb9b896ccfcd69c6
by git＠ipfire.org 09 Jan '17

09 Jan '17

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 544cc6c7259ca8de4dbf5686bb9b896ccfcd69c6 (commit) via 5f1546328e2a495f3cf57232564bbc7dc474df40 (commit) from d2d13b36f49c0def85f58aea89901991dc1000b7 (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 544cc6c7259ca8de4dbf5686bb9b896ccfcd69c6 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Jan 9 15:26:54 2017 +0000 sarg: Update to 2.3.10 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 5f1546328e2a495f3cf57232564bbc7dc474df40 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Jan 9 14:57:24 2017 +0000 lang: Add string for "Guardian" This is shown in the log section even when the add-on is not installed and was rendered as an empty field Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: doc/language_issues.en | 1 - langs/en/cgi-bin/en.pl | 1 + lfs/sarg | 10 +++++++--- 3 files changed, 8 insertions(+), 4 deletions(-) Difference in files: diff --git a/doc/language_issues.en b/doc/language_issues.en index 0362802..f2b6eb7 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -707,7 +707,6 @@ WARNING: untranslated string: Scan for Songs WARNING: untranslated string: bytes WARNING: untranslated string: fwhost cust geoipgrp WARNING: untranslated string: fwhost err hostip -WARNING: untranslated string: guardian WARNING: untranslated string: guardian block a host WARNING: untranslated string: guardian block httpd brute-force WARNING: untranslated string: guardian block owncloud brute-force diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 0e5b46d..a04d994 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1246,6 +1246,7 @@ 'green interface' => 'Green Interface', 'grouptype' => 'Grouptype:', 'guaranteed bandwith' => 'Guaranteed bandwith', +'guardian' => 'Guardian', 'guest ok' => 'allow guests to access', 'gui settings' => 'GUI Settings', 'gz with key' => 'Only an encrypted archive can be restored on this machine.', diff --git a/lfs/sarg b/lfs/sarg index ce309a1..0d9e821 100644 --- a/lfs/sarg +++ b/lfs/sarg @@ -24,7 +24,7 @@ include Config -VER = 2.3.9 +VER = 2.3.10 THISAPP = sarg-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = sarg -PAK_VER = 2 +PAK_VER = 3 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = d6e8b854950f1bebb953e0ea2ca13428 +$(DL_FILE)_MD5 = f3c5f9a55ffea1662f6ec88daa0c49c3 install : $(TARGET) @@ -77,6 +77,10 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + + # Update gettext Makefile + cd $(DIR_APP) && cp -vf /usr/share/gettext/po/Makefile.in.in po/Makefile.in.in + cd $(DIR_APP) && ./configure \ --prefix=/usr \ --sysconfdir=/etc/sarg hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. d2d13b36f49c0def85f58aea89901991dc1000b7
by git＠ipfire.org 04 Jan '17

04 Jan '17

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 d2d13b36f49c0def85f58aea89901991dc1000b7 (commit) from f2a309dc088a735a862052e8c77ecf1261e5ee50 (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 d2d13b36f49c0def85f58aea89901991dc1000b7 Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org> Date: Wed Jan 4 15:33:55 2017 +0100 Libvirt: Rootfile fixes Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/packages/libvirt | 41 ++++++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 18 deletions(-) Difference in files: diff --git a/config/rootfiles/packages/libvirt b/config/rootfiles/packages/libvirt index fe287ea..7285eb6 100644 --- a/config/rootfiles/packages/libvirt +++ b/config/rootfiles/packages/libvirt @@ -31,8 +31,6 @@ etc/logrotate.d/libvirtd.libxl etc/logrotate.d/libvirtd.qemu #etc/logrotate.d/libvirtd.uml etc/rc.d/init.d/libvirt-guests -etc/rc.d/init.d/libvirtd -etc/rc.d/init.d/virtlogd usr/bin/virsh usr/bin/virt-admin usr/bin/virt-host-validate @@ -124,12 +122,8 @@ usr/sbin/virtlogd #usr/share/doc/libvirt-2.5.0/html/api.html #usr/share/doc/libvirt-2.5.0/html/api_extension.html #usr/share/doc/libvirt-2.5.0/html/apps.html -#usr/share/doc/libvirt-2.5.0/html/archdomain.html #usr/share/doc/libvirt-2.5.0/html/architecture.gif #usr/share/doc/libvirt-2.5.0/html/architecture.html -#usr/share/doc/libvirt-2.5.0/html/archnetwork.html -#usr/share/doc/libvirt-2.5.0/html/archnode.html -#usr/share/doc/libvirt-2.5.0/html/archstorage.html #usr/share/doc/libvirt-2.5.0/html/auditlog.html #usr/share/doc/libvirt-2.5.0/html/auth.html #usr/share/doc/libvirt-2.5.0/html/bindings.html @@ -137,8 +131,8 @@ usr/sbin/virtlogd #usr/share/doc/libvirt-2.5.0/html/cgroups.html #usr/share/doc/libvirt-2.5.0/html/compiling.html #usr/share/doc/libvirt-2.5.0/html/contact.html +#usr/share/doc/libvirt-2.5.0/html/contribute.html #usr/share/doc/libvirt-2.5.0/html/csharp.html -#usr/share/doc/libvirt-2.5.0/html/deployment.html #usr/share/doc/libvirt-2.5.0/html/devguide.html #usr/share/doc/libvirt-2.5.0/html/docs.html #usr/share/doc/libvirt-2.5.0/html/downloads.html @@ -203,22 +197,33 @@ usr/sbin/virtlogd #usr/share/doc/libvirt-2.5.0/html/internals/locking.html #usr/share/doc/libvirt-2.5.0/html/internals/oomtesting.html #usr/share/doc/libvirt-2.5.0/html/internals/rpc.html -#usr/share/doc/libvirt-2.5.0/html/intro.html #usr/share/doc/libvirt-2.5.0/html/java.html #usr/share/doc/libvirt-2.5.0/html/libvirt-daemon-arch.png #usr/share/doc/libvirt-2.5.0/html/libvirt-driver-arch.png -#usr/share/doc/libvirt-2.5.0/html/libvirt-header-bg.png -#usr/share/doc/libvirt-2.5.0/html/libvirt-header-logo.png -#usr/share/doc/libvirt-2.5.0/html/libvirt-net-logical.png -#usr/share/doc/libvirt-2.5.0/html/libvirt-net-physical.png #usr/share/doc/libvirt-2.5.0/html/libvirt-object-model.png #usr/share/doc/libvirt-2.5.0/html/libvirt.css -#usr/share/doc/libvirt-2.5.0/html/libvirtLogo.png #usr/share/doc/libvirt-2.5.0/html/locking-lockd.html #usr/share/doc/libvirt-2.5.0/html/locking-sanlock.html #usr/share/doc/libvirt-2.5.0/html/locking.html #usr/share/doc/libvirt-2.5.0/html/logging.html -#usr/share/doc/libvirt-2.5.0/html/madeWith.png +#usr/share/doc/libvirt-2.5.0/html/logos +#usr/share/doc/libvirt-2.5.0/html/logos/logo-banner-dark-256.png +#usr/share/doc/libvirt-2.5.0/html/logos/logo-banner-dark-800.png +#usr/share/doc/libvirt-2.5.0/html/logos/logo-banner-dark.svg +#usr/share/doc/libvirt-2.5.0/html/logos/logo-banner-light-256.png +#usr/share/doc/libvirt-2.5.0/html/logos/logo-banner-light-800.png +#usr/share/doc/libvirt-2.5.0/html/logos/logo-banner-light.svg +#usr/share/doc/libvirt-2.5.0/html/logos/logo-base.svg +#usr/share/doc/libvirt-2.5.0/html/logos/logo-square-128.png +#usr/share/doc/libvirt-2.5.0/html/logos/logo-square-192.png +#usr/share/doc/libvirt-2.5.0/html/logos/logo-square-256.png +#usr/share/doc/libvirt-2.5.0/html/logos/logo-square-96.png +#usr/share/doc/libvirt-2.5.0/html/logos/logo-square-powered-128.png +#usr/share/doc/libvirt-2.5.0/html/logos/logo-square-powered-192.png +#usr/share/doc/libvirt-2.5.0/html/logos/logo-square-powered-256.png +#usr/share/doc/libvirt-2.5.0/html/logos/logo-square-powered-96.png +#usr/share/doc/libvirt-2.5.0/html/logos/logo-square-powered.svg +#usr/share/doc/libvirt-2.5.0/html/logos/logo-square.svg #usr/share/doc/libvirt-2.5.0/html/main.css #usr/share/doc/libvirt-2.5.0/html/migration-managed-direct.png #usr/share/doc/libvirt-2.5.0/html/migration-managed-p2p.png @@ -237,17 +242,15 @@ usr/sbin/virtlogd #usr/share/doc/libvirt-2.5.0/html/news-2013.html #usr/share/doc/libvirt-2.5.0/html/news-2014.html #usr/share/doc/libvirt-2.5.0/html/news-2015.html +#usr/share/doc/libvirt-2.5.0/html/news-2016.html #usr/share/doc/libvirt-2.5.0/html/news.html #usr/share/doc/libvirt-2.5.0/html/node.gif #usr/share/doc/libvirt-2.5.0/html/nss.html -#usr/share/doc/libvirt-2.5.0/html/pending.html #usr/share/doc/libvirt-2.5.0/html/php.html #usr/share/doc/libvirt-2.5.0/html/python.html -#usr/share/doc/libvirt-2.5.0/html/relatedlinks.html #usr/share/doc/libvirt-2.5.0/html/remote.html #usr/share/doc/libvirt-2.5.0/html/secureusage.html #usr/share/doc/libvirt-2.5.0/html/securityprocess.html -#usr/share/doc/libvirt-2.5.0/html/sitemap.html #usr/share/doc/libvirt-2.5.0/html/storage.html #usr/share/doc/libvirt-2.5.0/html/testapi.html #usr/share/doc/libvirt-2.5.0/html/testsuites.html @@ -273,10 +276,10 @@ usr/share/libvirt/api/libvirt-api.xml usr/share/libvirt/api/libvirt-lxc-api.xml usr/share/libvirt/api/libvirt-qemu-api.xml usr/share/libvirt/cpu_map.xml -#usr/share/libvirt/libvirtLogo.png #usr/share/libvirt/schemas usr/share/libvirt/schemas/basictypes.rng usr/share/libvirt/schemas/capability.rng +usr/share/libvirt/schemas/cputypes.rng usr/share/libvirt/schemas/domain.rng usr/share/libvirt/schemas/domaincaps.rng usr/share/libvirt/schemas/domaincommon.rng @@ -313,3 +316,5 @@ var/ipfire/backup/addons/includes/libvirt #var/log/libvirt/lxc #var/log/libvirt/qemu #var/log/libvirt/uml +etc/rc.d/init.d/libvirtd +etc/rc.d/init.d/virtlogd hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. f2a309dc088a735a862052e8c77ecf1261e5ee50
by git＠ipfire.org 04 Jan '17

04 Jan '17

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 f2a309dc088a735a862052e8c77ecf1261e5ee50 (commit) via 9a657e9b3b07ae7fbc0d953ecdf0651e14a461ee (commit) via b1b6e9f396efca5552df649d04a12bdbd1c4acb5 (commit) from 391560854f64ad2385adb3ff25dbbcec0ff92668 (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 f2a309dc088a735a862052e8c77ecf1261e5ee50 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Tue Jan 3 20:28:22 2017 +0100 tmux: Update to 2.3 For details see: https://raw.githubusercontent.com/tmux/tmux/master/CHANGES Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 9a657e9b3b07ae7fbc0d953ecdf0651e14a461ee Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jan 4 11:22:02 2017 +0000 core109: Ship updated backupiso script Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit b1b6e9f396efca5552df649d04a12bdbd1c4acb5 Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org> Date: Tue Jan 3 17:49:06 2017 +0100 Fix the backup iso script once again. In commit 391560854f64ad2385adb3ff25dbbcec0ff92668 was an error in the case statement. On i?586 the check fails. Removing the "" fixes the error. Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/109/filelists/files | 1 + lfs/tmux | 10 +++++----- src/scripts/backupiso | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) Difference in files: diff --git a/config/rootfiles/core/109/filelists/files b/config/rootfiles/core/109/filelists/files index 7c1cc3f..182b816 100644 --- a/config/rootfiles/core/109/filelists/files +++ b/config/rootfiles/core/109/filelists/files @@ -3,4 +3,5 @@ etc/issue lib/udev/rules.d/60-net.rules lib/udev/network-hotplug-bridges lib/udev/network-hotplug-rename +usr/local/bin/backupiso usr/local/bin/syslogdctrl diff --git a/lfs/tmux b/lfs/tmux index 2223d13..300080d 100644 --- a/lfs/tmux +++ b/lfs/tmux @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2014 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 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 = 1.9a +VER = 2.3 THISAPP = tmux-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = tmux -PAK_VER = 3 +PAK_VER = 4 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = b07601711f96f1d260b390513b509a2d +$(DL_FILE)_MD5 = fcfd1611d705d8b31df3c26ebc93bd3e install : $(TARGET) @@ -54,7 +54,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/src/scripts/backupiso b/src/scripts/backupiso index 1a682d0..1799bc1 100644 --- a/src/scripts/backupiso +++ b/src/scripts/backupiso @@ -2,11 +2,11 @@ arch=$(uname -m) case $arch in - "i?86") + i?86) arch="i586" echo "Your arch is $arch" ;; - "x86_64") + x86_64) arch="x86_64" echo "Your arch is $arch" ;; hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 06e0bdd3b38e4e79ae95ba8ccdde8412d94e1f77
by git＠ipfire.org 03 Jan '17

03 Jan '17

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 3.x development tree". The branch, master has been updated via 06e0bdd3b38e4e79ae95ba8ccdde8412d94e1f77 (commit) from 31a112dc6f9cc314fe74473d4b0138f8fb6898a9 (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 06e0bdd3b38e4e79ae95ba8ccdde8412d94e1f77 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Tue Jan 3 08:38:21 2017 +0100 compat-gnutls: Only ship libgnutls. There is an error on the transaktion test when, installing compat-gnutls because libgnutlsxx.so.28 is provided by this package and the main gnutls package. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: compat-gnutls/compat-gnutls.nm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) Difference in files: diff --git a/compat-gnutls/compat-gnutls.nm b/compat-gnutls/compat-gnutls.nm index 51af81d..3d11740 100644 --- a/compat-gnutls/compat-gnutls.nm +++ b/compat-gnutls/compat-gnutls.nm @@ -7,7 +7,7 @@ name = compat-gnutls version = %{ver_maj}.%{ver_min} ver_maj = 3.3 ver_min = 25 -release = 1 +release = 2 thisapp = gnutls-%{version} groups = System/Libraries @@ -62,7 +62,6 @@ build # Install just the library and no headers. mkdir -pv %{BUILDROOT}%{libdir} cp -avf lib/.libs/libgnutls.so.* %{BUILDROOT}%{libdir} - cp -avf lib/.libs/libgnutlsxx.so.* %{BUILDROOT}%{libdir} end end hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 391560854f64ad2385adb3ff25dbbcec0ff92668
by git＠ipfire.org 02 Jan '17

02 Jan '17

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 391560854f64ad2385adb3ff25dbbcec0ff92668 (commit) from 9a015b5bd54887495c8670aee91335cfabf9d6f1 (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 391560854f64ad2385adb3ff25dbbcec0ff92668 Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org> Date: Mon Jan 2 16:17:08 2017 +0100 Improvement of backup iso script The backup iso script did not check the arch of the host. On x86_64 host the wrong iso was downloaded. Furthermore, there were some if clauses which could cause trouble which I also tried to improve. (For example: -e is valid if we have a directory or a file, but we want to check for a file only ) Fixes: 11258 Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: src/scripts/backupiso | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) Difference in files: diff --git a/src/scripts/backupiso b/src/scripts/backupiso index 014e8e9..1a682d0 100644 --- a/src/scripts/backupiso +++ b/src/scripts/backupiso @@ -1,9 +1,25 @@ #!/bin/sh +arch=$(uname -m) + +case $arch in + "i?86") + arch="i586" + echo "Your arch is $arch" + ;; + "x86_64") + arch="x86_64" + echo "Your arch is $arch" + ;; + *) + echo "Arch is not supported" + exit 1 + ;; +esac COREVER=$(cat /opt/pakfire/db/core/mine) # FIXME: edit this lines before release URL="http://download.ipfire.org/releases/ipfire-2.x/2.19-core$COREVER/" -ISO="ipfire-2.19.i586-full-core$COREVER.iso" +ISO="ipfire-2.19.$arch-full-core$COREVER.iso" if [ -z $1 ]; then echo usage: $0 backup-file @@ -15,7 +31,7 @@ TS=$1 mkdir -p /var/tmp/backupiso cd /var/tmp/backupiso -if [ ! -e ${ISO} ] +if [ ! -f ${ISO} ] then echo "Fetching ${URL}${ISO}" wget --quiet -c ${URL}${ISO} @@ -26,7 +42,7 @@ wget --quiet -O ${ISO}.md5 ${URL}${ISO}.md5 echo "Checking md5 of ${ISO}" md5sum --status -c ${ISO}.md5 -if [ $? -eq 0 -o $? -eq 24 ] +if [ $? -eq 0 ] || [ $? -eq 24 ] then echo "md5 is OK" else @@ -35,7 +51,7 @@ else wget --quiet -O ${ISO} ${URL}${ISO} echo "Checking again md5 of ${ISO}" md5sum --status -c ${ISO}.md5 - if [ $? -eq 0 -o $? -eq 24 ] + if [ $? -eq 0 ] || [ $? -eq 24 ] then echo "md5 is OK" else hooks/post-receive -- IPFire 2.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM January 2017