bump networkmanager to 0.8.4 series

2025-02-03 14:47:17 +08:00 · 2011-06-09 09:51:06 +00:00 · 2011-06-09 09:51:06 +00:00 · 24e27977b6
commit 24e27977b6
parent 51ca165c13
7 changed files with 85 additions and 49 deletions
--- a/dbus/PKGBUILD
+++ b/dbus/PKGBUILD
@ -1,9 +1,11 @@
-# $Id: PKGBUILD 90544 2010-09-13 10:56:13Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Link Dupont <link@subpop.net>
+#
+# Core Packages for Chakra, part of chakra-project.org
+#
+# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
+# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
 #
 pkgname=dbus
-pkgver=1.4.0
+pkgver=1.4.10
 pkgrel=1
 pkgdesc="Freedesktop.org message bus system"
 url="http://www.freedesktop.org/Software/dbus"
@ -13,7 +15,7 @@ depends=("dbus-core>=${pkgver}" 'libx11')
 makedepends=('libsm' 'libice')
 source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz
        30-dbus)
-md5sums=('f59618b18d2fb2bd1fce9e1c5a2a3282'
+md5sums=('402a2f8102bedbe236e2891b2b0f31c2'
         'd14e59575f04e55d21a04907b6fd9f3c')

 build() {
@ -26,10 +28,14 @@ build() {
      --disable-tests --disable-asserts
  cd tools
  make dbus-launch
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}/tools"
  install -m755 -d "${pkgdir}/usr/bin"
-  install -m755 -d "${pkgdir}/usr/share/man/man1"
+  #install -m755 -d "${pkgdir}/usr/share/man/man1"
  install -m755 dbus-launch "${pkgdir}/usr/bin/" || return 1
-  install -m644 dbus-launch.1 "${pkgdir}/usr/share/man/man1/"
+  #install -m644 dbus-launch.1 "${pkgdir}/usr/share/man/man1/"

  install -m755 -d "${pkgdir}/etc/X11/xinit/xinitrc.d"
  install -m755 "${srcdir}/30-dbus" "${pkgdir}/etc/X11/xinit/xinitrc.d/"
--- a/networkmanager-openconnect/PKGBUILD
+++ b/networkmanager-openconnect/PKGBUILD
@ -4,23 +4,20 @@
 # maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
 # maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>

-# include global config
-source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
-
 pkgname=networkmanager-openconnect
-pkgver=0.8.2
-pkgrel=2
+pkgver=0.8.4
+pkgrel=1
 pkgdesc="NetworkManager VPN integration for openconnect"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.gnome.org/projects/NetworkManager/"
-depends=('networkmanager>=0.8' 'openconnect>=2.21' 'dbus-glib')
+depends=('networkmanager>=0.8' 'openconnect>=3.02' 'dbus-glib')
 makedepends=('intltool' 'gtk2' 'libglade' 'gconf' 'gnome-keyring' 'libgnome-keyring')
 optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager')
 options=('!libtool')
 install=$pkgname.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openconnect/0.8/NetworkManager-openconnect-${pkgver}.tar.bz2)
-sha256sums=('6ef8ff1a14e112baf7d90cc1c19163c7895b56b60629641086540bacb8babb4f')
+sha256sums=('33924e63ed483015664aef35960716ee83954f59af429145bed168ee36360096')

 build() {
  cd "${srcdir}/NetworkManager-openconnect-${pkgver}"
@ -29,5 +26,9 @@ build() {
 	--libexecdir=/usr/lib/networkmanager \
 	--disable-static || return 1
  make || return 1
+}
+
+package() {
+  cd "${srcdir}/NetworkManager-openconnect-${pkgver}"
  make DESTDIR="${pkgdir}" install || return 1
 }
--- a/networkmanager-openvpn/PKGBUILD
+++ b/networkmanager-openvpn/PKGBUILD
@ -8,8 +8,8 @@
 source ../_buildscripts/${current_repo}-${_arch}-cfg.conf

 pkgname=networkmanager-openvpn
-pkgver=0.8.2
-pkgrel=2
+pkgver=0.8.4
+pkgrel=1
 pkgdesc="NetworkManager VPN plugin for OpenVPN"
 arch=('i686' 'x86_64')
 license=('GPL')
@ -20,7 +20,7 @@ optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager')
 install=networkmanager-openvpn.install
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openvpn/0.8/NetworkManager-openvpn-${pkgver}.tar.bz2)
-sha256sums=('21d540b7e7cd88cff3173bb3574a88d4dd76da564fccc58dc436a68476d6d6fe')
+sha256sums=('65736633c15a87dc9de9291746d02684e853fd93bef2ff06969e269bc37791be')

 build() {
  cd "${srcdir}/NetworkManager-openvpn-${pkgver}"
@ -29,5 +29,9 @@ build() {
 	--libexecdir=/usr/lib/networkmanager \
 	--disable-static || return 1
  make || return 1
+}
+
+package() {
+  cd "${srcdir}/NetworkManager-openvpn-${pkgver}"
  make DESTDIR="${pkgdir}" install || return 1
 }
--- a/networkmanager-pptp/PKGBUILD
+++ b/networkmanager-pptp/PKGBUILD
@ -8,8 +8,8 @@
 source ../_buildscripts/${current_repo}-${_arch}-cfg.conf

 pkgname=networkmanager-pptp
-pkgver=0.8.2
-pkgrel=2
+pkgver=0.8.4
+pkgrel=1
 pkgdesc="NetworkManager VPN plugin for pptp "
 arch=('i686' 'x86_64')
 license=('GPL')
@ -20,7 +20,7 @@ optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager')
 options=('!libtool')
 install=networkmanager-pptp.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-pptp/0.8/NetworkManager-pptp-${pkgver}.tar.bz2)
-sha256sums=('c90172273d6b29a5f3fec138cc474d6a7003edf35918602f3b7283ddd05d87e6')
+sha256sums=('eacc4aca4cd427d075d4b3da97862f12ff6414d2cbd1a51a0f6a8ef27d02c93a')

 build() {
  cd "${srcdir}/NetworkManager-pptp-${pkgver}"
@ -29,5 +29,9 @@ build() {
 	--libexecdir=/usr/lib/networkmanager \
 	--disable-static || return 1
  make || return 1
+}
+
+package() {
+  cd "${srcdir}/NetworkManager-pptp-${pkgver}"
  make DESTDIR="${pkgdir}" install || return 1
 }
--- a/networkmanager-vpnc/PKGBUILD
+++ b/networkmanager-vpnc/PKGBUILD
@ -8,8 +8,8 @@
 source ../_buildscripts/${current_repo}-${_arch}-cfg.conf

 pkgname=networkmanager-vpnc
-pkgver=0.8.2
-pkgrel=2
+pkgver=0.8.4
+pkgrel=1
 pkgdesc="NetworkManager VPN plugin for vpnc"
 arch=('i686' 'x86_64')
 license=('GPL')
@ -20,7 +20,7 @@ optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager')
 options=('!libtool')
 install=networkmanager-vpnc.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-vpnc/0.8/NetworkManager-vpnc-${pkgver}.tar.bz2)
-sha256sums=('c37cf921c223f226d16e659321bb372e33278bf642362b7a92cb665d27950011')
+sha256sums=('f475e159ea57c4117ac6ec4bb21576de2c4f806ede65fc75ad05714568db64f9')

 build() {
  cd "${srcdir}/NetworkManager-vpnc-${pkgver}"
@ -29,5 +29,9 @@ build() {
 	--libexecdir=/usr/lib/networkmanager \
 	--disable-static || return 1
  make || return 1
+}
+
+package() {
+  cd "${srcdir}/NetworkManager-vpnc-${pkgver}"
  make DESTDIR="${pkgdir}" install || return 1
 }
--- a/networkmanager/PKGBUILD
+++ b/networkmanager/PKGBUILD
@ -8,8 +8,8 @@
 source ../_buildscripts/${current_repo}-${_arch}-cfg.conf

 pkgname=networkmanager
-pkgver=0.8.2
-pkgrel=4
+pkgver=0.8.4.0
+pkgrel=1
 pkgdesc="Network Management daemon"
 arch=('i686' 'x86_64')
 license=('GPL')
@ -20,28 +20,38 @@ optdepends=('modemmanager: for modem management service')
 options=('!libtool')
 backup=('etc/NetworkManager/nm-system-settings.conf')
 source=(http://ftp.gnome.org/pub/gnome/sources/NetworkManager/0.8/NetworkManager-${pkgver}.tar.bz2
-        nm-system-settings.conf create_dirs.patch disable_set_hostname.patch)
-sha256sums=('58e49dcd83cb641a9dcaad4fd566a08196c862479ad3086c00f28f03768eb4f1'
+        nm-system-settings.conf disable_set_hostname.patch)
+sha256sums=('e71f2ed5b28b9d46566fbf573e43ee8553e60aa3f557dc61e07b9e198c657588'
            '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21'
-            '2961ce4cf3079edbf27927a67573ce85dad2268f610fd123dd781eb5ba764c12'
            '1e4586991bc96ef004dc520c794047a336c54433e0bd4edc3879fb6e7ab0e553')

 build() {
  cd "${srcdir}/NetworkManager-${pkgver}"

-  patch -Np1 -i "${srcdir}/create_dirs.patch"
  patch -Np1 -i "${srcdir}/disable_set_hostname.patch"
-  autoreconf -fi

-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --with-distro=arch --localstatedir=/var \
-      --libexecdir=/usr/lib/networkmanager \
-      --disable-static --with-dhcpcd=/sbin/dhcpcd \
-      --with-crypto=nss --with-iptables=/usr/sbin/iptables \
-      --enable-more-warnings=no
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --localstatedir=/var \
+    --libexecdir=/usr/lib/networkmanager \
+    --with-crypto=nss \
+    --with-distro=arch \
+    --with-dhclient=/usr/sbin/dhclient \
+    --with-dhcpcd=/sbin/dhcpcd \
+    --with-iptables=/usr/sbin/iptables \
+    --disable-static \
+    --enable-more-warnings=no \
+    --disable-wimax

  make
+}
+
+package() {
+  cd "${srcdir}/NetworkManager-${pkgver}"
  make DESTDIR="${pkgdir}" install
+
  install -m644 "${srcdir}/nm-system-settings.conf" "${pkgdir}/etc/NetworkManager/"
-  install -m 0755 test/.libs/nm-online "${pkgdir}/usr/bin/"
+
+  rm -rf "${pkgdir}/var/run/"
 }
--- a/openconnect/PKGBUILD
+++ b/openconnect/PKGBUILD
@ -1,24 +1,31 @@
-# $Id: PKGBUILD 79661 2010-05-05 12:29:26Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
+#
+# Chakra Packages for Chakra, part of chakra-project.org
+#
+# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
+# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>

 pkgname=openconnect
-pkgver=2.23
+pkgver=3.02
 pkgrel=1
 pkgdesc="Open client for Cisco AnyConnect VPN"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.infradead.org/openconnect.html"
-depends=('libxml2' 'openssl')
-makedepends=('gconf' 'gtk2')
-options=('!libtool')
+depends=('libxml2' 'openssl' 'libproxy')
+options=('!libtool' '!emptydirs')
 source=(ftp://ftp.infradead.org/pub/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-sha256sums=('7dba814a83d6070d02d90513c16280a3f242dcb198f405daa45a01e2f3dc4a65')
+md5sums=('c12688474f432a6d590958cc1c1ff076')

 build() {
  cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i "s|/usr/libexec|/usr/lib/networkmanager|" Makefile || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
-
-  install  -Dm0644 openconnect.8 "${pkgdir}"/usr/share/man/man8/openconnect.8 || return 1
+  sed -i "s|/usr/libexec|/usr/lib/networkmanager|" Makefile
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  make DESTDIR="${pkgdir}" LIBDIR=/usr/lib install-lib
+
+  install  -Dm0644 openconnect.8 "${pkgdir}"/usr/share/man/man8/openconnect.8
 }