summaryrefslogtreecommitdiff
path: root/network/NetworkManager/NetworkManager.SlackBuild
diff options
context:
space:
mode:
authorRobby Workman <rworkman@slackbuilds.org>2011-01-10 12:44:27 -0600
committerRobby Workman <rworkman@slackbuilds.org>2011-01-10 12:44:27 -0600
commit4851069dfdd41d5cf9071f04ab48fc11b61ccd81 (patch)
tree801cfe14b0d7b3a90af43d1ce8d241028b63b435 /network/NetworkManager/NetworkManager.SlackBuild
parent68c0f83fbbf1e39803c1f76321b50b99a2b124ba (diff)
downloadslackbuilds-4851069dfdd41d5cf9071f04ab48fc11b61ccd81.tar.gz
network/NetworkManager: Included several patches from upstream
This commit adds quite a few patches from the upstream NM_0_8 git branch. Most of them are bugfix-only patches, but the two dealing with /etc/hosts policy are changes in behavior. This *should* be an improvement for us, but if you notice any ill effects, please advise. Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
Diffstat (limited to 'network/NetworkManager/NetworkManager.SlackBuild')
-rw-r--r--network/NetworkManager/NetworkManager.SlackBuild29
1 files changed, 23 insertions, 6 deletions
diff --git a/network/NetworkManager/NetworkManager.SlackBuild b/network/NetworkManager/NetworkManager.SlackBuild
index c858e24ea8..427360e606 100644
--- a/network/NetworkManager/NetworkManager.SlackBuild
+++ b/network/NetworkManager/NetworkManager.SlackBuild
@@ -69,9 +69,30 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+# Fix Slackware init script
patch -p1 < $CWD/patches/fixup_rc.networkmanager.patch
-patch -p1 < $CWD/patches/fix_crash_in_glib_with_time.patch
-patch -p1 < $CWD/patches/ignore_temp_files.patch
+
+# Apply some patches from the 0.8 branch in NM git
+patch -p1 < $CWD/patches/keyfile-create-keyfile-data-directory-during-install.patch
+patch -p1 < $CWD/patches/keyfile-quiet-keyfile-plugin-when-re-read-connection.patch
+patch -p1 < $CWD/patches/build-create-NM-state-directory-at-install-time.patch
+patch -p1 < $CWD/patches/keyfile-ignore-temporary-files-bgo-602868.patch
+patch -p1 < $CWD/patches/dhcpcd-prevent-dhcpcd-from-messing-with-routing-bgo-.patch
+patch -p1 < $CWD/patches/wired-fix-uninitialized-variable.patch
+patch -p1 < $CWD/patches/core-correct-TIMESTAMP-type-fixes-potential-crash-wh.patch
+patch -p1 < $CWD/patches/dhcp-ensure-that-dhcp-client-is-exited.patch
+patch -p1 < $CWD/patches/keyfile-allow-uppercase-MAC-addresses-in-unmanaged-d.patch
+patch -p1 < $CWD/patches/core-handle-device-removal-when-properties-are-unrea.patch
+patch -p1 < $CWD/patches/examples-fix-querying-active-connections.patch
+patch -p1 < $CWD/patches/core-suppress-error-message-when-user-settings-servi.patch
+patch -p1 < $CWD/patches/dns-fix-a-crash-due-to-uninitialized-nis_domain-nove.patch
+patch -p1 < $CWD/patches/libnm-glib-actually-define-the-ip-interface-property.patch
+patch -p1 < $CWD/patches/libnm-util-fix-a-memory-leaks-in-nm_setting_to_strin.patch
+patch -p1 < $CWD/patches/dns-direct-IPv4-reverse-DNS-queries-to-split-DNS-ser.patch
+patch -p1 < $CWD/patches/policy-stop-touching-etc-hosts.patch
+patch -p1 < $CWD/patches/modem-handle-IP-Method-changes-after-modem-has-been-.patch
+patch -p1 < $CWD/patches/policy-don-t-update-hostname-on-exit.patch
+patch -p1 < $CWD/patches/core-handle-D-Bus-disconnect-better-on-exit.patch
autoreconf
@@ -110,10 +131,6 @@ mkdir -p $PKG/etc/NetworkManager
cat $CWD/NetworkManager.conf.new > \
$PKG/etc/NetworkManager/NetworkManager.conf.new
-# Create the /etc/NetworkManager/system-connections/ directory, since the
-# install target of the Makefile no longer does this
-mkdir -p $PKG/etc/NetworkManager/system-connections/
-
# This file should actually be shipped with Slackware's wpa_supplicant
# package, but since we missed it there (oops), we'll do it here:
mkdir -p $PKG/usr/share/dbus-1/system-services