Skip to content

Instantly share code, notes, and snippets.

Embed
What would you like to do?
Patch for networkmanager-git PKGBUILD and related files
diff --git a/NetworkManager.conf b/NetworkManager.conf
index c37b596..e01e3c5 100644
--- a/NetworkManager.conf
+++ b/NetworkManager.conf
@@ -1,2 +1,10 @@
[main]
plugins=keyfile
+
+## Set static hostname
+#[keyfile]
+#hostname=foobar
+
+## HTTP-based connectivity check
+#[connectivity]
+#uri=http://nmcheck.gnome.org/check_network_status.txt
diff --git a/PKGBUILD b/PKGBUILD
index 5491a38..f0612af 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,83 +10,92 @@
_gitname=NetworkManager
pkgname=networkmanager-git
-pkgver=0.9.8.beta1.764.g7dcec4d
+pkgver=0.9.10.beta1.428.g722712b
pkgrel=1
pkgdesc="Network Management daemon"
arch=(i686 x86_64)
-url=http://www.gnome.org/projects/$_gitname
-license=(GPL3)
-depends=(dbus-glib dhclient libsoup polkit wpa_supplicant)
-makedepends=(git gobject-introspection gtk-doc intltool libndp-git)
-optdepends=('modemmanager: for modem management service'
- 'dnsmasq: Connection sharing'
+license=(GPL2 LGPL2.1)
+url="http://www.gnome.org/projects/NetworkManager/"
+_pppver=2.4.6
+makedepends=(intltool dhcpcd dhclient iptables gobject-introspection gtk-doc git "ppp=$_pppver"
+ modemmanager dbus-glib iproute2 libnl nss polkit wpa_supplicant dhcp-client libsoup
+ systemd libmm-glib rp-pppoe libnewt libndp libteam vala)
+checkdepends=(libx11 python-gobject python-dbus)
+depends=(libsystemd nss dbus-glib libutil-linux iproute2 libnl polkit wpa_supplicant dhcp-client
+ libsoup libmm-glib libnewt libndp libteam)
+optdepends=('dhclient: DHCPv6 support'
+ 'dnsmasq: connection sharing'
'bluez: Bluetooth support'
- 'openresolv: resolvconf support')
-provides=(${pkgname%-*}=$pkgver)
-conflicts=(${pkgname%-*})
-backup=(etc/NetworkManager/NetworkManager.conf)
-options=(!emptydirs !libtool)
+ 'openresolv: resolvconf support'
+ 'ppp: dialup connection support'
+ 'rp-pppoe: ADSL support'
+ 'modemmanager: cellular network support')
+backup=('etc/NetworkManager/NetworkManager.conf')
+provides=("${pkgname%-*}=$pkgver" "libnm-glib=$pkgver")
+conflicts=(${pkgname%-*} libnm-glib)
install=$pkgname.install
-source=($pkgname::git://anongit.freedesktop.org/$_gitname/$_gitname.git
+source=($pkgname::git://anongit.freedesktop.org/$_gitname/$_gitname
git://git.gnome.org/libgsystem
- NetworkManager.conf
- disable_set_hostname.patch
- dnsmasq-path.patch
- nm-polkit-permissive.patch)
-sha256sums=('SKIP'
- 'SKIP'
- '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21'
- '46f3d7cc5fdc449e613b1e6a651879f87f0a9fa65818e7e0ebae20b11d2eef39'
- 'e7753d8ae42395289c0294f039a658628086383a56ea03cafe38a4579012879f'
- '91881a6ba962800895901fcc6929955b9d49095b6ed97fd913c99c77ddd630db')
-sha512sums=('SKIP'
- 'SKIP'
- '1f4e6c09da5a8921ee7759861cfa5e808c64cd27e733cd62cfb35776db05a226a73443c071730035480c9ba4abe85fa7daeb14aeffbbdae20ed193d78341f451'
- '8527e8dfe5b46fc44b85f93532e8a0431d6a7934c4f782aca90a451ac3a3576dd15aa28df040f1b114f65e9037bc9895eb908e92bd4e4c621e6a9c7178a3ec34'
- 'a2276623bb1d8e7c5f0c647a2bd24aca54a138c353bb9ff137263090af4141d184d943010052836de829158c7f1f0b873c67c05af5e1433efe9611f5e37c9c1a'
- 'c8668a85332065f5cd89650951a15725bae1f5a530b61fbc2fe57d51a8924b1f3e8765cd3784d89476db3d2d9c8992156c4986424670d91d8f960425abbacde5')
+ NetworkManager.conf disable_set_hostname.patch)
pkgver() {
cd $pkgname/
git describe --tags | sed 's/-/./g'
}
+sha256sums=(SKIP SKIP
+ '759db295ddae7a6dc6b29211fc0ec08695f875584d456dd146d3679e2c33e2e3'
+ '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460')
+
prepare() {
cd $pkgname/
- find ../ -name '*.patch' -exec patch -Np1 -i '{}' \;
+ patch -Np1 -i ../disable_set_hostname.patch
rm -rf libgsystem/
ln -sf ../libgsystem
+ NOCONFIGURE=1 ./autogen.sh
}
build() {
cd $pkgname/
- gtkdocize
- autopoint --force
- AUTOPOINT="intltoolize -f -c --automake" autoreconf -fi
- ./configure \
- --prefix=/usr \
+ ./configure --prefix=/usr \
--sysconfdir=/etc \
--localstatedir=/var \
+ --sbindir=/usr/bin \
--libexecdir=/usr/lib/networkmanager \
--with-crypto=nss \
- --with-distro=arch \
- --with-dhclient=/usr/sbin/dhclient \
- --with-dhcpcd=/usr/sbin/dhcpcd \
- --with-iptables=/usr/sbin/iptables \
+ --with-dhclient=/usr/bin/dhclient \
+ --with-dhcpcd=/usr/bin/dhcpcd \
+ --with-dnsmasq=/usr/bin/dnsmasq \
+ --with-iptables=/usr/bin/iptables \
--with-systemdsystemunitdir=/usr/lib/systemd/system \
--with-udev-dir=/usr/lib/udev \
- --with-resolvconf=/usr/sbin/resolvconf \
+ --with-resolvconf=/usr/bin/resolvconf \
+ --with-pppd=/usr/bin/pppd \
+ --with-pppd-plugin-dir=/usr/lib/pppd/$_pppver \
+ --with-pppoe=/usr/bin/pppoe \
+ --with-kernel-firmware-dir=/usr/lib/firmware \
--with-session-tracking=systemd \
+ --with-modem-manager-1 \
--disable-static \
--enable-more-warnings=no \
- --disable-wimax
+ --disable-wimax \
+ --enable-modify-system \
+ --enable-doc
+
make
}
+# check() {
+# cd $pkgname/
+# make -k check
+# }
+
package() {
- make -C $pkgname DESTDIR="$pkgdir" install
- install -m644 $_gitname.conf "$pkgdir"/etc/$_gitname/
- rm -r "$pkgdir"/var/run
- # Provide native service for arch-daemons generator
- ln -s $_gitname.service "$pkgdir"/usr/lib/systemd/system/$pkgname.service
+ cd $pkgname/
+ make DESTDIR="$pkgdir" install
+
+ install -m644 ../NetworkManager.conf "$pkgdir/etc/NetworkManager/"
+ install -m755 -d "$pkgdir/etc/NetworkManager/dnsmasq.d"
+
+ rm -r "$pkgdir/var/run"
}
diff --git a/disable_set_hostname.patch b/disable_set_hostname.patch
index 6cc4598..ee95dd0 100644
--- a/disable_set_hostname.patch
+++ b/disable_set_hostname.patch
@@ -1,19 +1,19 @@
diff -Nur NetworkManager-0.9.0.orig/src/nm-policy.c NetworkManager-0.9.0/src/nm-policy.c
---- a/src/nm-policy.c 2011-08-23 06:41:02.099686450 +0000
-+++ b/src/nm-policy.c 2011-08-23 06:43:38.227791737 +0000
-@@ -320,6 +320,7 @@
- return;
- }
-
+--- NetworkManager-0.9.0.orig/src/nm-policy.c 2011-08-23 06:41:02.099686450 +0000
++++ NetworkManager-0.9.0/src/nm-policy.c 2011-08-23 06:43:38.227791737 +0000
+@@ -302,6 +302,7 @@
+ return;
+ }
+
+#if 0
- /* Try automatically determined hostname from the best device's IP config */
- if (!best4)
- best4 = get_best_ip4_device (policy->manager);
-@@ -374,6 +374,7 @@
- }
- }
-
+ /* Try automatically determined hostname from the best device's IP config */
+ if (!best4)
+ best4 = get_best_ip4_device (policy->manager, &best_req4);
+@@ -356,6 +357,7 @@
+ }
+ }
+
+#endif
- /* If no automatically-configured hostname, try using the hostname from
- * when NM started up.
- */
+ /* If no automatically-configured hostname, try using the hostname from
+ * when NM started up.
+ */
diff --git a/dnsmasq-path.patch b/dnsmasq-path.patch
deleted file mode 100644
index f14ced5..0000000
--- a/dnsmasq-path.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/src/dns-manager/nm-dns-dnsmasq.c 2011-10-10 23:38:20.000000000 +0200
-+++ b/src/dns-manager/nm-dns-dnsmasq.c 2012-03-06 09:07:24.137460927 +0100
-@@ -53,8 +53,11 @@
- find_dnsmasq (void)
- {
- static const char *paths[] = {
-+ "/usr/local/bin/dnsmasq",
- "/usr/local/sbin/dnsmasq",
-+ "/usr/bin/dnsmasq",
- "/usr/sbin/dnsmasq",
-+ "/bin/dnsmasq",
- "/sbin/dnsmasq",
- NULL
- };
---- a/src/dnsmasq-manager/nm-dnsmasq-manager.c 2011-04-19 07:06:22.000000000 +0200
-+++ b/src/dnsmasq-manager/nm-dnsmasq-manager.c 2012-03-06 09:07:58.603851818 +0100
-@@ -171,8 +171,11 @@
- nm_find_dnsmasq (void)
- {
- static const char *dnsmasq_binary_paths[] = {
-+ "/usr/local/bin/dnsmasq",
- "/usr/local/sbin/dnsmasq",
-+ "/usr/bin/dnsmasq",
- "/usr/sbin/dnsmasq",
-+ "/bin/dnsmasq",
- "/sbin/dnsmasq",
- NULL
- };
diff --git a/networkmanager-git.install b/networkmanager-git.install
index fa4592a..de40c17 100644
--- a/networkmanager-git.install
+++ b/networkmanager-git.install
@@ -1,8 +1,9 @@
post_upgrade() {
- (( $(vercmp 0.8.3 $2) > 0 )) && cat << __MSG__
+ (( $(vercmp 0.8.3 $2) > 0 )) && cat <<MSG
ATTENTION:
/etc/NetworkManager/nm-system-settings.conf has been replaced
by /etc/NetworkManager/NetworkManager.conf. Make sure you move
any custom settings to the new config file.
-__MSG__
+MSG
+ true
}
diff --git a/nm-polkit-permissive.patch b/nm-polkit-permissive.patch
deleted file mode 100644
index 9606d83..0000000
--- a/nm-polkit-permissive.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/policy/org.freedesktop.NetworkManager.policy.in.in 2011-03-24 14:21:35.100912222 -0500
-+++ b/policy/org.freedesktop.NetworkManager.policy.in.in 2011-03-24 14:21:49.916726997 -0500
-@@ -104,7 +104,7 @@
- <_message>System policy prevents modification of the persistent system hostname</_message>
- <defaults>
- <allow_inactive>no</allow_inactive>
-- <allow_active>auth_admin_keep</allow_active>
-+ <allow_active>yes</allow_active>
- </defaults>
- </action>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.