From 8602330a78a911a83bf5d5c9b032c975447befb0 Mon Sep 17 00:00:00 2001 From: Robby Workman Date: Thu, 2 Dec 2010 05:42:41 -0600 Subject: network/NetworkManager: Updated for version 0.8.2. Signed-off-by: Erik Hanson --- network/NetworkManager/NetworkManager.SlackBuild | 16 ++++++++++----- network/NetworkManager/NetworkManager.conf.new | 11 +++++++++++ network/NetworkManager/NetworkManager.info | 6 +++--- network/NetworkManager/doinst.sh | 4 ++-- .../fix_crash_in_glib_with_time.patch | 23 ++++++++++++++++++++++ network/NetworkManager/nm-system-settings.conf.new | 11 ----------- 6 files changed, 50 insertions(+), 21 deletions(-) create mode 100644 network/NetworkManager/NetworkManager.conf.new create mode 100644 network/NetworkManager/fix_crash_in_glib_with_time.patch delete mode 100644 network/NetworkManager/nm-system-settings.conf.new (limited to 'network') diff --git a/network/NetworkManager/NetworkManager.SlackBuild b/network/NetworkManager/NetworkManager.SlackBuild index 2ff696cc80..fbfee0c9fc 100644 --- a/network/NetworkManager/NetworkManager.SlackBuild +++ b/network/NetworkManager/NetworkManager.SlackBuild @@ -23,8 +23,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=NetworkManager -VERSION=${VERSION:-0.8.1} -BUILD=${BUILD:-2} +VERSION=${VERSION:-0.8.2} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -69,6 +69,8 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +patch -p1 < $CWD/fix_crash_in_glib_with_time.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -97,12 +99,16 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r # Don't clobber existing rc.networkmanager mv $PKG/etc/rc.d/rc.networkmanager $PKG/etc/rc.d/rc.networkmanager.new -# Add a 'starter' nm-system-settings.conf file +# Add a 'starter' NetworkManager.conf file # This sets the hostname (during postinstall) to match the system's name # and defines dhcpcd as the dhcp client to use mkdir -p $PKG/etc/NetworkManager -cat $CWD/nm-system-settings.conf.new > \ - $PKG/etc/NetworkManager/nm-system-settings.conf.new +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: diff --git a/network/NetworkManager/NetworkManager.conf.new b/network/NetworkManager/NetworkManager.conf.new new file mode 100644 index 0000000000..9a57be16bd --- /dev/null +++ b/network/NetworkManager/NetworkManager.conf.new @@ -0,0 +1,11 @@ +# /etc/NetworkManager/nm-system-settings.conf +# +# See NetworkManager.conf(5) for more information on this file + +[main] +plugins=keyfile +dhcp=dhcpcd + +[keyfile] +hostname=yourhostname + diff --git a/network/NetworkManager/NetworkManager.info b/network/NetworkManager/NetworkManager.info index 0fede87b44..f4434526d9 100644 --- a/network/NetworkManager/NetworkManager.info +++ b/network/NetworkManager/NetworkManager.info @@ -1,8 +1,8 @@ PRGNAM="NetworkManager" -VERSION="0.8.1" +VERSION="0.8.2" HOMEPAGE="http://projects.gnome.org/NetworkManager/" -DOWNLOAD="ftp://ftp.gnome.org/pub/GNOME/sources/NetworkManager/0.8/NetworkManager-0.8.1.tar.bz2" -MD5SUM="96e551149dda8f6e0a5621f77468ba79" +DOWNLOAD="ftp://ftp.gnome.org/pub/GNOME/sources/NetworkManager/0.8/NetworkManager-0.8.2.tar.bz2" +MD5SUM="951158258544f761d9c09c052a7072e2" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="Robby Workman" diff --git a/network/NetworkManager/doinst.sh b/network/NetworkManager/doinst.sh index 39b8957282..2b419b26b2 100644 --- a/network/NetworkManager/doinst.sh +++ b/network/NetworkManager/doinst.sh @@ -24,9 +24,9 @@ preserve_perms() { if [ -e etc/HOSTNAME ]; then sed -i "s,yourhostname,$(cat etc/HOSTNAME | cut -f1 -d .)," \ - etc/NetworkManager/nm-system-settings.conf.new + etc/NetworkManager/NetworkManager.conf.new fi preserve_perms etc/rc.d/rc.networkmanager.new -config etc/NetworkManager/nm-system-settings.conf.new +config etc/NetworkManager/NetworkManager.conf.new diff --git a/network/NetworkManager/fix_crash_in_glib_with_time.patch b/network/NetworkManager/fix_crash_in_glib_with_time.patch new file mode 100644 index 0000000000..7a2f8782f5 --- /dev/null +++ b/network/NetworkManager/fix_crash_in_glib_with_time.patch @@ -0,0 +1,23 @@ +From b8ff25eb43c9fa5eb534495a501c73169649d0a6 Mon Sep 17 00:00:00 2001 +From: Jiří Klimeš +Date: Tue, 23 Nov 2010 18:06:58 +0000 +Subject: core: correct TIMESTAMP type; fixes potential crash when time() is 32bit + +The Crash appeared on some platforms in glib while processing variable +arguments. +--- +diff --git a/src/system-settings/nm-default-wired-connection.c b/src/system-settings/nm-default-wired-connection.c +index 1cda3d9..0d19dea 100644 +--- a/src/system-settings/nm-default-wired-connection.c ++++ b/src/system-settings/nm-default-wired-connection.c +@@ -163,7 +163,7 @@ constructor (GType type, + NM_SETTING_CONNECTION_AUTOCONNECT, TRUE, + NM_SETTING_CONNECTION_UUID, uuid, + NM_SETTING_CONNECTION_READ_ONLY, priv->read_only, +- NM_SETTING_CONNECTION_TIMESTAMP, time (NULL), ++ NM_SETTING_CONNECTION_TIMESTAMP, (guint64) time (NULL), + NULL); + + g_free (id); +-- +cgit v0.8.3-6-g21f6 diff --git a/network/NetworkManager/nm-system-settings.conf.new b/network/NetworkManager/nm-system-settings.conf.new deleted file mode 100644 index 9a57be16bd..0000000000 --- a/network/NetworkManager/nm-system-settings.conf.new +++ /dev/null @@ -1,11 +0,0 @@ -# /etc/NetworkManager/nm-system-settings.conf -# -# See NetworkManager.conf(5) for more information on this file - -[main] -plugins=keyfile -dhcp=dhcpcd - -[keyfile] -hostname=yourhostname - -- cgit v1.2.3