summaryrefslogtreecommitdiff
path: root/source/n/NetworkManager
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2018-09-15 21:19:23 +0000
committerEric Hameleers <alien@slackware.com>2018-09-16 09:00:33 +0200
commit77f4f1f5e6332a7c51dad716aba3ff2b03dc8d8a (patch)
tree3452730572f2f95f43e4b9ef756384579e2deb3d /source/n/NetworkManager
parent1b2f3407f0e85eec4d4628f6f36fd1ad88c31063 (diff)
downloadcurrent-77f4f1f5e6332a7c51dad716aba3ff2b03dc8d8a.tar.gz
Sat Sep 15 21:19:23 UTC 201820180915211923
a/kernel-firmware-20180913_44d4fca-noarch-1.txz: Upgraded. a/kernel-generic-4.14.70-x86_64-1.txz: Upgraded. a/kernel-huge-4.14.70-x86_64-1.txz: Upgraded. a/kernel-modules-4.14.70-x86_64-1.txz: Upgraded. ap/hplip-3.18.7-x86_64-4.txz: Rebuilt. Applied fixed patch - this has a better chance of working now. I've checked and hpcups no longer links to libImageProcessor. Which, by the way, the previous build dumped onto my main system (not even in "make install"), but not into the package itself. I no longer own an HP printer and will never buy another one, so if there are any remaining problems please report. Thanks to Matteo Bernardini. d/kernel-headers-4.14.70-x86-1.txz: Upgraded. k/kernel-source-4.14.70-noarch-1.txz: Upgraded. Config changes since 4.14.69: CLEANCACHE n -> y CMA n -> y MEMORY_FAILURE n -> y NUMA n -> y X86_CHECK_BIOS_CORRUPTION n -> y Z3FOLD m -> y ZBUD m -> y ZSMALLOC m -> y +ACPI_APEI_MEMORY_FAILURE y +ACPI_NUMA y +AMD_NUMA y +CMA_AREAS 7 +CMA_DEBUG n +CMA_DEBUGFS n +DMA_CMA n +HWPOISON_INJECT m +NEED_MULTIPLE_NODES y +NODES_SHIFT 6 +NODES_SPAN_OTHER_NODES y +NUMA_BALANCING n +NUMA_EMU n +RAS_CEC n +USE_PERCPU_NUMA_NODE_ID y +X86_64_ACPI_NUMA y +X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK n n/NetworkManager-1.14.0-x86_64-1.txz: Upgraded. Added new options: --enable-json-validation --enable-ovs xap/network-manager-applet-1.8.18-x86_64-1.txz: Upgraded. isolinux/initrd.img: Rebuilt. kernels/*: Upgraded. pasture/php-5.6.38-x86_64-1.txz: Upgraded. One security bug has been fixed in this release: Apache2: XSS due to the header Transfer-Encoding: chunked For more information, see: https://php.net/ChangeLog-5.php#5.6.38 (* Security fix *) usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to 'source/n/NetworkManager')
-rwxr-xr-xsource/n/NetworkManager/NetworkManager.SlackBuild9
-rw-r--r--source/n/NetworkManager/patches/version-fix-compile-error-due-to-NM_AVAILABLE_IN_1_12_2-m.patch25
2 files changed, 6 insertions, 28 deletions
diff --git a/source/n/NetworkManager/NetworkManager.SlackBuild b/source/n/NetworkManager/NetworkManager.SlackBuild
index fdfe6ef3..d547ec17 100755
--- a/source/n/NetworkManager/NetworkManager.SlackBuild
+++ b/source/n/NetworkManager/NetworkManager.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=NetworkManager
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
MARCH=$( uname -m )
@@ -107,6 +107,9 @@ automake
# json-c library. If there's any interest or usefulness with that, let me
# know. The library is fairly small, but in order to actually use team
# interfaces will probably require more stuff (not sure how much).
+#
+# Update September 2018: Added those options since we needed Jansson
+# already for HTTP/2 support.
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
@@ -128,8 +131,8 @@ CXXFLAGS="$SLKCFLAGS" \
--with-nmtui=yes \
--with-libnm-glib \
--disable-vala \
- --disable-json-validation \
- --disable-ovs \
+ --enable-json-validation \
+ --enable-ovs \
--with-session-tracking=consolekit \
--with-suspend-resume=consolekit \
--with-hostname-persist=slackware \
diff --git a/source/n/NetworkManager/patches/version-fix-compile-error-due-to-NM_AVAILABLE_IN_1_12_2-m.patch b/source/n/NetworkManager/patches/version-fix-compile-error-due-to-NM_AVAILABLE_IN_1_12_2-m.patch
deleted file mode 100644
index 2783890f..00000000
--- a/source/n/NetworkManager/patches/version-fix-compile-error-due-to-NM_AVAILABLE_IN_1_12_2-m.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Thomas Haller <thaller@redhat.com>
-Date: Tue, 31 Jul 2018 14:13:57 +0200
-Subject: version: fix compile error due to NM_AVAILABLE_IN_1_12_2 macro
-
-Fixes: 8d09660481e1ff8b513aa60b2c40a4982ccc57cd
-
-https://mail.gnome.org/archives/networkmanager-list/2018-July/msg00023.html
-(cherry picked from commit 0a3755c1799d3a4dc1875d4c59c7c568a64c8456)
----
- libnm-core/nm-version.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libnm-core/nm-version.h b/libnm-core/nm-version.h
-index ee6dbc0..c240489 100644
---- a/libnm-core/nm-version.h
-+++ b/libnm-core/nm-version.h
-@@ -161,7 +161,7 @@
- #endif
-
- #if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_12_2
--# define NM_AVAILABLE_IN_1_12_2 G_UNAVAILABLE(1,12,2)
-+# define NM_AVAILABLE_IN_1_12_2 G_UNAVAILABLE(1,12.2)
- #else
- # define NM_AVAILABLE_IN_1_12_2
- #endif