[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 1a34f7612b5839963b715e45e83edb7d72d46049
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 1a34f7612b5839963b715e45e83edb7d72d46049 (commit) via 3410b8caf06d79da784ad7605e42ed4485933a89 (commit) via e1187e5093f5de084248354e194119e1bcd65c45 (commit) via 840393ec991cb2d007390a904a28704b677176c6 (commit) via bb097c543845375c4c347cc09d57bdcb5343a0fd (commit) from 2e1a376086ab02be907efffb6573f32f8fb15813 (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 1a34f7612b5839963b715e45e83edb7d72d46049 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Fri Jun 21 13:33:49 2019 +0200
glib2: Update to 2.61
glib2 now uses meson as build system
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 3410b8caf06d79da784ad7605e42ed4485933a89 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Fri Jun 21 13:32:36 2019 +0200
util-linux: libmount-devel now requires libblkid-devel
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit e1187e5093f5de084248354e194119e1bcd65c45 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Fri Jun 21 13:31:23 2019 +0200
meson: Update to 0.50.1
* Also add macro file for pakfire.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 840393ec991cb2d007390a904a28704b677176c6 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Fri Jun 21 13:29:50 2019 +0200
ninja: Update to 1.9.0
* Also add macro file for pakfire.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit bb097c543845375c4c347cc09d57bdcb5343a0fd Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Jun 21 01:04:39 2019 +0100
liboping: Fix build with GCC 9
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: glib2/glib2.nm | 32 ++++++++++++++--- liboping/liboping.nm | 8 ++--- ...size-to-make-GCC-s-truncation-check-happy.patch | 28 +++++++++++++++ meson/meson.macro | 42 ++++++++++++++++++++++ meson/meson.nm | 8 ++++- ninja/ninja.macro | 21 +++++++++++ ninja/ninja.nm | 8 ++++- util-linux/util-linux.nm | 6 +++- 8 files changed, 141 insertions(+), 12 deletions(-) create mode 100644 liboping/patches/ping_host_add-Decrease-buffer-size-to-make-GCC-s-truncation-check-happy.patch create mode 100644 meson/meson.macro create mode 100644 ninja/ninja.macro
Difference in files: diff --git a/glib2/glib2.nm b/glib2/glib2.nm index 8d2f2558c..328d57aaa 100644 --- a/glib2/glib2.nm +++ b/glib2/glib2.nm @@ -4,7 +4,7 @@ ###############################################################################
name = glib2 -ver_major = 2.55 +ver_major = 2.61 ver_minor = 1 version = %{ver_major}.%{ver_minor} release = 1 @@ -29,18 +29,40 @@ sources = %{thisapp}.tar.xz
build requires + docbook-xsl gettext libffi-devel - libmount-devel + libmount-devel >= 2.34-2 + meson >= 0.50.1 pcre-devel pkg-config zlib-devel end
- configure_options += \ - --with-pcre=system + prepare_cmds + # Explicitly remove PCRE sources since we use --with-pcre=system + rm glib/pcre/*.[ch] + end + + build + %{meson} \ + --default-library=both \ + -Dselinux=disabled \ + -Dman=true \ + -Ddtrace=false \ + -Delf=false \ + -Dfam=false \ + -Dsystemtap=true \ + -Dgtk_doc=false \ + -Dinstalled_tests=false + + + %{meson_build} + end + + install + %{meson_install}
- install_cmds mkdir -pv %{BUILDROOT}/etc/profile.d/ cp -vf %{DIR_SOURCE}/glib2-locale.sh %{BUILDROOT}/etc/profile.d/ end diff --git a/liboping/liboping.nm b/liboping/liboping.nm index a4b42984d..127522717 100644 --- a/liboping/liboping.nm +++ b/liboping/liboping.nm @@ -4,11 +4,11 @@ ###############################################################################
name = liboping -version = 1.8.0 -release = 1 +version = 1.10.0 +release = 2
groups = Development/Tools -url = http://noping.cc/ +url = https://noping.cc/ license = LGPLv2.1 and GPLv2 summary = liboping is a C library to generate ICMP echo requests
@@ -21,7 +21,7 @@ description fping rolled into one. end
-source_dl = http://noping.cc/files/ +source_dl = https://noping.cc/files/
build requires diff --git a/liboping/patches/ping_host_add-Decrease-buffer-size-to-make-GCC-s-truncation-check-happy.patch b/liboping/patches/ping_host_add-Decrease-buffer-size-to-make-GCC-s-truncation-check-happy.patch new file mode 100644 index 000000000..a7b3a3edd --- /dev/null +++ b/liboping/patches/ping_host_add-Decrease-buffer-size-to-make-GCC-s-truncation-check-happy.patch @@ -0,0 +1,28 @@ +From 18ca43507b351f339ff23062541ee8d58e813a53 Mon Sep 17 00:00:00 2001 +From: Florian Forster ff@octo.it +Date: Sun, 29 Jul 2018 14:34:19 +0200 +Subject: [PATCH] ping_host_add: Decrease buffer size to make GCC's truncation + check happy. + +Fixes: #38 +--- + src/liboping.c | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +diff --git a/src/liboping.c b/src/liboping.c +index 5253e8c..2470988 100644 +--- a/src/liboping.c ++++ b/src/liboping.c +@@ -1636,10 +1636,8 @@ int ping_host_add (pingobj_t *obj, const char *host) + } + else + { +- char errmsg[PING_ERRMSG_LEN]; +- +- snprintf (errmsg, PING_ERRMSG_LEN, "Unknown `ai_family': %i", ai_ptr->ai_family); +- errmsg[PING_ERRMSG_LEN - 1] = '\0'; ++ char errmsg[64]; ++ snprintf (errmsg, sizeof(errmsg), "Unknown `ai_family': %d", ai_ptr->ai_family); + + dprintf ("%s", errmsg); + ping_set_error (obj, "getaddrinfo", errmsg); diff --git a/meson/meson.macro b/meson/meson.macro new file mode 100644 index 000000000..f26c7af21 --- /dev/null +++ b/meson/meson.macro @@ -0,0 +1,42 @@ +# +# Meson macros +# + + +__meson = %{bindir}/meson +__meson_wrap_mode = nodownload +__meson_auto_features = enabled + +_smp_mesonflags = %{PARALLELISMFLAGS} + +meson = \ + %{__meson} \ + --buildtype=plain \ + --prefix=%{prefix} \ + --libdir=%{libdir} \ + --libexecdir=%{libexecdir} \ + --bindir=%{bindir} \ + --sbindir=%{sbindir} \ + --includedir=%{includedir} \ + --datadir=%{datadir} \ + --mandir=%{mandir} \ + --infodir=%{infodir} \ + --localedir=%{datadir}/locale \ + --sysconfdir=%{sysconfdir} \ + --localstatedir=%{localstatedir} \ + --sharedstatedir=%{sharedstatedir} \ + --wrap-mode=%{__meson_wrap_mode} \ + --auto-features=%{__meson_auto_features} \ + . %{DISTRO_MACHINE} + +meson_build = \ + %{ninja_build} -C %{DISTRO_MACHINE} + +meson_install = \ + %{ninja_install} -C %{DISTRO_MACHINE} + +meson_test = \ + %{__meson} test \ + -C %{DISTRO_MACHINE} \ + %{PARALLELISMFLAGS} \ + --print-errorlogs diff --git a/meson/meson.nm b/meson/meson.nm index 208966a79..b7a687155 100644 --- a/meson/meson.nm +++ b/meson/meson.nm @@ -4,7 +4,7 @@ ###############################################################################
name = meson -version = 0.48.1 +version = 0.50.1 release = 1 arch = noarch
@@ -40,12 +40,18 @@ build
install %{python3} setup.py install -O1 --skip-build --root %{BUILDROOT} + + # Install pakfire macro. + mkdir -p %{BUILDROOT}/usr/lib/pakfire/macros + install -v -m 644 %{DIR_SOURCE}/%{name}.macro \ + %{BUILDROOT}/usr/lib/pakfire/macros end end
packages package %{name} requires + ninja-build >= 1.9.0 python3-setuptools end end diff --git a/ninja/ninja.macro b/ninja/ninja.macro new file mode 100644 index 000000000..8d2d0c75c --- /dev/null +++ b/ninja/ninja.macro @@ -0,0 +1,21 @@ +# +# ninja-build macros +# + + +__ninja = %{bindir}/ninja +__ninja_common_opts = -v %{PARALLELISMFLAGS} + +ninja_build = \ + %{__ninja} \ + %{__ninja_common_opts} + +ninja_install = \ + DESTDIR=%{BUILDROOT} \ + %{__ninja} install \ + %{__ninja_common_opts} + +ninja_test = \ + %{__ninja} test \ + %{__ninja_common_opts} + diff --git a/ninja/ninja.nm b/ninja/ninja.nm index e0793d8a0..ef54e5d99 100644 --- a/ninja/ninja.nm +++ b/ninja/ninja.nm @@ -4,7 +4,7 @@ ###############################################################################
name = ninja -version = 1.8.2 +version = 1.9.0 release = 1
groups = Applications/System @@ -55,6 +55,12 @@ build
# Install ninja syntax highlighting for vim. install -Dpm0644 misc/ninja.vim %{BUILDROOT}%{datadir}/vim/vimfiles/syntax/ninja.vim + + # Install pakfire macro. + mkdir -p %{BUILDROOT}/usr/lib/pakfire/macros + install -v -m 644 %{DIR_SOURCE}/%{name}.macro \ + %{BUILDROOT}/usr/lib/pakfire/macros + end end
diff --git a/util-linux/util-linux.nm b/util-linux/util-linux.nm index 10cc5dbc5..7a1e66a2c 100644 --- a/util-linux/util-linux.nm +++ b/util-linux/util-linux.nm @@ -5,7 +5,7 @@
name = util-linux version = 2.34 -release = 1 +release = 2
maintainer = Stefan Schantl stefan.schantl@ipfire.org groups = System/Base @@ -236,6 +236,10 @@ packages summary = Development library and header of libmount. description = %{summary}
+ requires + libblkid-devel = %{thisver} + end + files %{includedir}/libmount/ %{libdir}/libmount.so
hooks/post-receive -- IPFire 3.x development tree
-
Michael Tremer