diff options
| author | Alexey D | 2015-05-07 08:57:47 +0300 |
|---|---|---|
| committer | Alexey D | 2015-07-05 12:33:34 +0300 |
| commit | 0f498a09cba902415610732f38120aa87154b56c (patch) | |
| tree | 07ec3ad9fbbc7b5db62dfc7ae570018bc8b57757 | |
| parent | cc934e9c8ed35d35dbd2392c9b6efd31e613a2ba (diff) | |
| download | aur-0f498a09cba902415610732f38120aa87154b56c.tar.gz | |
version 1.0.2-1
| -rw-r--r-- | .SRCINFO | 16 | ||||
| -rw-r--r-- | NetworkManager.conf | 3 | ||||
| -rw-r--r-- | PKGBUILD | 13 | ||||
| -rw-r--r-- | networkmanager.install | 2 |
4 files changed, 21 insertions, 13 deletions
@@ -1,7 +1,7 @@ pkgbase = networkmanager-consolekit pkgdesc = NetworkManager with ConsoleKit support for non-systemd systems - pkgver = 1.0.0 - pkgrel = 2 + pkgver = 1.0.2 + pkgrel = 1 url = http://www.gnome.org/projects/NetworkManager/ install = networkmanager.install arch = i686 @@ -16,7 +16,7 @@ pkgbase = networkmanager-consolekit makedepends = modemmanager makedepends = rp-pppoe makedepends = vala - depends = libnm-glib>=1.0.0 + depends = libnm-glib>=1.0.2 depends = iproute2 depends = libnl depends = polkit-consolekit @@ -35,18 +35,20 @@ pkgbase = networkmanager-consolekit optdepends = bluez: bluetooth support optdepends = openresolv: resolvconf support optdepends = ppp: dialup connection support - provides = networkmanager=1.0.0 + provides = networkmanager=1.0.2 conflicts = networkmanager replaces = networkmanager backup = etc/NetworkManager/NetworkManager.conf - source = http://ftp.gnome.org/pub/gnome/sources/NetworkManager/1.0/NetworkManager-1.0.0.tar.xz + source = http://ftp.gnome.org/pub/gnome/sources/NetworkManager/1.0/NetworkManager-1.0.2.tar.xz source = NetworkManager.conf source = disable_set_hostname.patch source = networkmanager.rc - sha256sums = 3a66afec670c975edd9832e620b725a5f16ed267a1b9e1b2d51ef27250d85947 - sha256sums = 759db295ddae7a6dc6b29211fc0ec08695f875584d456dd146d3679e2c33e2e3 + source = 0001-dns-Fix-falling-back-in-the-resolv.conf-methods.patch + sha256sums = 359385707494bedbb48cfe0992ccfbcc4ac147dae1f7a47055c71e96439508ff + sha256sums = 2c6a647b5aec9f3c356d5d95251976a21297c6e64bd8d2a59339f8450a86cb3b sha256sums = 25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460 sha256sums = e39a2a0401518abd1d1d060200e2ca0f0854cdc49a5cb286919be177a7cd90fc + sha256sums = 4c5cbd0871437c43c2081fe4a1e58d6464c9b960798fd57fd80a79135647e50a pkgname = networkmanager-consolekit diff --git a/NetworkManager.conf b/NetworkManager.conf index e01e3c52f7e0..66822962823b 100644 --- a/NetworkManager.conf +++ b/NetworkManager.conf @@ -1,5 +1,7 @@ [main] plugins=keyfile +dhcp=dhclient +dns=default ## Set static hostname #[keyfile] @@ -8,3 +10,4 @@ plugins=keyfile ## HTTP-based connectivity check #[connectivity] #uri=http://nmcheck.gnome.org/check_network_status.txt +#interval=100 @@ -10,8 +10,8 @@ pkgname=networkmanager-consolekit _pkgname=NetworkManager -pkgver=1.0.0 -pkgrel=2 +pkgver=1.0.2 +pkgrel=1 _pppver=2.4.7 pkgdesc="NetworkManager with ConsoleKit support for non-systemd systems" arch=('i686' 'x86_64') @@ -38,16 +38,19 @@ source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver:0:3}/$_pkgname NetworkManager.conf disable_set_hostname.patch networkmanager.rc + 0001-dns-Fix-falling-back-in-the-resolv.conf-methods.patch ) -sha256sums=('3a66afec670c975edd9832e620b725a5f16ed267a1b9e1b2d51ef27250d85947' - '759db295ddae7a6dc6b29211fc0ec08695f875584d456dd146d3679e2c33e2e3' +sha256sums=('359385707494bedbb48cfe0992ccfbcc4ac147dae1f7a47055c71e96439508ff' + '2c6a647b5aec9f3c356d5d95251976a21297c6e64bd8d2a59339f8450a86cb3b' '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460' - 'e39a2a0401518abd1d1d060200e2ca0f0854cdc49a5cb286919be177a7cd90fc') + 'e39a2a0401518abd1d1d060200e2ca0f0854cdc49a5cb286919be177a7cd90fc' + '4c5cbd0871437c43c2081fe4a1e58d6464c9b960798fd57fd80a79135647e50a') prepare() { cd $_pkgname-$pkgver patch -Np1 -i ../disable_set_hostname.patch + patch -Np1 -i ../0001-dns-Fix-falling-back-in-the-resolv.conf-methods.patch NOCONFIGURE=1 ./autogen.sh } diff --git a/networkmanager.install b/networkmanager.install index de40c17ed1be..f9da4feb19e9 100644 --- a/networkmanager.install +++ b/networkmanager.install @@ -1,5 +1,5 @@ post_upgrade() { - (( $(vercmp 0.8.3 $2) > 0 )) && cat <<MSG + (( $(vercmp $2 0.8.3) < 0 )) && cat <<MSG ATTENTION: /etc/NetworkManager/nm-system-settings.conf has been replaced by /etc/NetworkManager/NetworkManager.conf. Make sure you move |