From 75826a796a4589c1999f1b3b86eb8c122ef44edd Mon Sep 17 00:00:00 2001 From: root Date: Sun, 30 Sep 2012 01:25:00 -0700 Subject: Sun Sep 30 01:24:59 PDT 2012 --- gnome-unstable/gcalctool/PKGBUILD | 30 +++++++++ gnome-unstable/gcalctool/gcalctool.install | 11 ++++ gnome-unstable/networkmanager/NetworkManager.conf | 2 + gnome-unstable/networkmanager/PKGBUILD | 75 ++++++++++++++++++++++ .../networkmanager/disable_set_hostname.patch | 19 ++++++ gnome-unstable/networkmanager/dnsmasq-path.patch | 30 +++++++++ .../networkmanager/networkmanager.install | 9 +++ .../networkmanager/nm-polkit-permissive.patch | 12 ++++ gnome-unstable/networkmanager/repair-signals.patch | 37 +++++++++++ gnome-unstable/polkit/PKGBUILD | 12 ++-- gnome-unstable/polkit/fix-empty-wheel.patch | 47 ++++++++++++++ gnome-unstable/telepathy-glib/PKGBUILD | 6 +- gnome-unstable/telepathy-mission-control/PKGBUILD | 33 ++++++++++ .../telepathy-mission-control.install | 11 ++++ 14 files changed, 327 insertions(+), 7 deletions(-) create mode 100644 gnome-unstable/gcalctool/PKGBUILD create mode 100644 gnome-unstable/gcalctool/gcalctool.install create mode 100644 gnome-unstable/networkmanager/NetworkManager.conf create mode 100644 gnome-unstable/networkmanager/PKGBUILD create mode 100644 gnome-unstable/networkmanager/disable_set_hostname.patch create mode 100644 gnome-unstable/networkmanager/dnsmasq-path.patch create mode 100644 gnome-unstable/networkmanager/networkmanager.install create mode 100644 gnome-unstable/networkmanager/nm-polkit-permissive.patch create mode 100644 gnome-unstable/networkmanager/repair-signals.patch create mode 100644 gnome-unstable/polkit/fix-empty-wheel.patch create mode 100644 gnome-unstable/telepathy-mission-control/PKGBUILD create mode 100644 gnome-unstable/telepathy-mission-control/telepathy-mission-control.install (limited to 'gnome-unstable') diff --git a/gnome-unstable/gcalctool/PKGBUILD b/gnome-unstable/gcalctool/PKGBUILD new file mode 100644 index 000000000..0fa8e119e --- /dev/null +++ b/gnome-unstable/gcalctool/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 167268 2012-09-29 15:00:51Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) +# Contributor: Jan de Groot + +pkgname=gcalctool +pkgver=6.6.0 +pkgrel=1 +pkgdesc="GNOME Scientific calculator" +arch=('i686' 'x86_64') +license=('GPL') +depends=('gtk3' 'dconf') +makedepends=('intltool' 'yelp-tools') +groups=('gnome-extra') +options=(!emptydirs) +url="http://www.gnome.org" +install=gcalctool.install +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver::3}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('0d2e0729be42e3ee06ea7d02fa6a00446df6e4de601745bcbbef53a027f9542e') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc --disable-schemas-compile \ + --localstatedir=/var + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="${pkgdir}" install +} diff --git a/gnome-unstable/gcalctool/gcalctool.install b/gnome-unstable/gcalctool/gcalctool.install new file mode 100644 index 000000000..2ef26aaa9 --- /dev/null +++ b/gnome-unstable/gcalctool/gcalctool.install @@ -0,0 +1,11 @@ +post_install() { + usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/gnome-unstable/networkmanager/NetworkManager.conf b/gnome-unstable/networkmanager/NetworkManager.conf new file mode 100644 index 000000000..c37b59680 --- /dev/null +++ b/gnome-unstable/networkmanager/NetworkManager.conf @@ -0,0 +1,2 @@ +[main] +plugins=keyfile diff --git a/gnome-unstable/networkmanager/PKGBUILD b/gnome-unstable/networkmanager/PKGBUILD new file mode 100644 index 000000000..ebc84c67d --- /dev/null +++ b/gnome-unstable/networkmanager/PKGBUILD @@ -0,0 +1,75 @@ +# $Id: PKGBUILD 167248 2012-09-29 10:55:58Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) +# Maintainer: Jan de Groot +# Contributor: Wael Nasreddine +# Contributor: Tor Krill +# Contributor: Will Rea +# Contributor: Valentine Sinitsyn + +pkgname=networkmanager +_pkgname=NetworkManager +pkgver=0.9.6.0 +pkgrel=3 +pkgdesc="Network Management daemon" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.gnome.org/projects/$_pkgname/" +depends=(dbus-glib iproute2 libnl nss polkit udev wpa_supplicant ppp dhclient + libsoup systemd) +makedepends=(intltool dhcpcd iptables gobject-introspection) +optdepends=('modemmanager: for modem management service' + 'dhcpcd: alternative DHCP client; does not support DHCPv6' + 'iptables: Connection sharing' + 'dnsmasq: Connection sharing' + 'bluez: Bluetooth support' + 'openresolv: resolvconf support') +options=('!libtool') +backup=('etc/NetworkManager/NetworkManager.conf') +install=networkmanager.install +source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver:0:3}/$_pkgname-$pkgver.tar.xz + NetworkManager.conf disable_set_hostname.patch dnsmasq-path.patch + nm-polkit-permissive.patch repair-signals.patch) +sha256sums=('3982b623b7b199ac99e2ddd0840fe7d088245a49e3f680237e8baebf0cf86d07' + '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21' + '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460' + '65124505048cc8396daf0242c9f5d532fa669b4bbca305998c248ab2329490cb' + 'e23b651a90ef62d515921953b4c6779538d35a737fb74c266b7fce94d62fdb06' + 'a1c65a09e5e8ecb1004ab7922517aa7fbc9700dc61e3b2fd348d3d7c23808ce6') + +build() { + cd $_pkgname-$pkgver + + patch -Np1 -i ../disable_set_hostname.patch + patch -Np1 -i ../dnsmasq-path.patch + patch -Np1 -i ../nm-polkit-permissive.patch + patch -Np1 -i ../repair-signals.patch # FS#31115 + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --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-systemdsystemunitdir=/usr/lib/systemd/system \ + --with-udev-dir=/usr/lib/udev \ + --with-resolvconf=/usr/sbin/resolvconf \ + --with-session-tracking=systemd \ + --disable-static \ + --enable-more-warnings=no \ + --disable-wimax + + make +} + +package() { + cd $_pkgname-$pkgver + make DESTDIR="$pkgdir" install + + install -m644 ../NetworkManager.conf "$pkgdir/etc/NetworkManager/" + + rm -r "$pkgdir/var/run" +} diff --git a/gnome-unstable/networkmanager/disable_set_hostname.patch b/gnome-unstable/networkmanager/disable_set_hostname.patch new file mode 100644 index 000000000..ee95dd0e1 --- /dev/null +++ b/gnome-unstable/networkmanager/disable_set_hostname.patch @@ -0,0 +1,19 @@ +diff -Nur NetworkManager-0.9.0.orig/src/nm-policy.c NetworkManager-0.9.0/src/nm-policy.c +--- 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, &best_req4); +@@ -356,6 +357,7 @@ + } + } + ++#endif + /* If no automatically-configured hostname, try using the hostname from + * when NM started up. + */ diff --git a/gnome-unstable/networkmanager/dnsmasq-path.patch b/gnome-unstable/networkmanager/dnsmasq-path.patch new file mode 100644 index 000000000..c0e713266 --- /dev/null +++ b/gnome-unstable/networkmanager/dnsmasq-path.patch @@ -0,0 +1,30 @@ +diff -u -r NetworkManager-0.9.2.0/src/dns-manager/nm-dns-dnsmasq.c NetworkManager-0.9.2.0-dnsmasq/src/dns-manager/nm-dns-dnsmasq.c +--- NetworkManager-0.9.2.0/src/dns-manager/nm-dns-dnsmasq.c 2011-10-10 23:38:20.000000000 +0200 ++++ NetworkManager-0.9.2.0-dnsmasq/src/dns-manager/nm-dns-dnsmasq.c 2012-03-06 09:07:24.137460927 +0100 +@@ -52,8 +52,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 + }; +diff -u -r NetworkManager-0.9.2.0/src/dnsmasq-manager/nm-dnsmasq-manager.c NetworkManager-0.9.2.0-dnsmasq/src/dnsmasq-manager/nm-dnsmasq-manager.c +--- NetworkManager-0.9.2.0/src/dnsmasq-manager/nm-dnsmasq-manager.c 2011-04-19 07:06:22.000000000 +0200 ++++ NetworkManager-0.9.2.0-dnsmasq/src/dnsmasq-manager/nm-dnsmasq-manager.c 2012-03-06 09:07:58.603851818 +0100 +@@ -170,8 +170,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/gnome-unstable/networkmanager/networkmanager.install b/gnome-unstable/networkmanager/networkmanager.install new file mode 100644 index 000000000..de40c17ed --- /dev/null +++ b/gnome-unstable/networkmanager/networkmanager.install @@ -0,0 +1,9 @@ +post_upgrade() { + (( $(vercmp 0.8.3 $2) > 0 )) && cat <System policy prevents modification of network settings for all users + + no +- auth_admin_keep ++ yes + + + diff --git a/gnome-unstable/networkmanager/repair-signals.patch b/gnome-unstable/networkmanager/repair-signals.patch new file mode 100644 index 000000000..cf1319dc5 --- /dev/null +++ b/gnome-unstable/networkmanager/repair-signals.patch @@ -0,0 +1,37 @@ +From 64342a313ef497fca8a4fb7567900d4a1460065f Mon Sep 17 00:00:00 2001 +From: Alexandre Rostovtsev +Date: Thu, 13 Sep 2012 09:32:53 +0000 +Subject: core: wait until we daemonized before setting up signals (bgo #683932) + +If we mask signals before daemonizing, the daemon process will not be +able to handle them, and thus would be unkillable with anything other +than SIGKILL. +--- +diff --git a/src/main.c b/src/main.c +index 8bc6d3f..5b82cfa 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -401,10 +401,6 @@ main (int argc, char *argv[]) + exit (1); + } + +- /* Set up unix signal handling */ +- if (!setup_signals ()) +- exit (1); +- + /* Set locale to be able to use environment variables */ + setlocale (LC_ALL, ""); + +@@ -501,6 +497,10 @@ main (int argc, char *argv[]) + wrote_pidfile = TRUE; + } + ++ /* Set up unix signal handling - before creating threads, but after daemonizing! */ ++ if (!setup_signals ()) ++ exit (1); ++ + if (g_fatal_warnings) { + GLogLevelFlags fatal_mask; + +-- +cgit v0.9.0.2-2-gbebe diff --git a/gnome-unstable/polkit/PKGBUILD b/gnome-unstable/polkit/PKGBUILD index 08a25c91b..fd432af0b 100644 --- a/gnome-unstable/polkit/PKGBUILD +++ b/gnome-unstable/polkit/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 166703 2012-09-16 00:14:29Z heftig $ +# $Id: PKGBUILD 167252 2012-09-29 12:13:31Z heftig $ # Maintainer: Jan de Groot pkgname=polkit pkgver=0.107 -pkgrel=3 +pkgrel=4 pkgdesc="Application development toolkit for controlling system-wide privileges" arch=(i686 x86_64) license=('LGPL') @@ -14,13 +14,17 @@ replaces=('policykit') options=('!libtool') install=polkit.install source=(http://www.freedesktop.org/software/polkit/releases/$pkgname-$pkgver.tar.gz - polkit.pam) + polkit.pam fix-empty-wheel.patch) md5sums=('0e4f9c53f43fd1b25ac3f0d2e09b2ae1' - '6564f95878297b954f0572bc1610dd15') + '6564f95878297b954f0572bc1610dd15' + 'c99ab2a7919ad0b69fde4804c043b07f') build() { cd $pkgname-$pkgver + # https://bugs.archlinux.org/task/31717 + patch -Np1 -i ../fix-empty-wheel.patch + ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --libexecdir=/usr/lib/polkit-1 \ --with-systemdsystemunitdir=/usr/lib/systemd/system \ diff --git a/gnome-unstable/polkit/fix-empty-wheel.patch b/gnome-unstable/polkit/fix-empty-wheel.patch new file mode 100644 index 000000000..d6f99c43d --- /dev/null +++ b/gnome-unstable/polkit/fix-empty-wheel.patch @@ -0,0 +1,47 @@ +From fa04223240d46641b0773dbf9f7d72f529046bea Mon Sep 17 00:00:00 2001 +From: David Zeuthen +Date: Tue, 18 Sep 2012 18:47:06 +0000 +Subject: Fall back to authenticating as uid 0 if the list of admin identities is empty + +For example, this can happen if the wheel group has no members. This +was reported in Red Hat bug 834494, see + + https://bugzilla.redhat.com/show_bug.cgi?id=834494 + +Signed-off-by: David Zeuthen +--- +diff --git a/src/polkitbackend/polkitbackendinteractiveauthority.c b/src/polkitbackend/polkitbackendinteractiveauthority.c +index 1d4a555..3bd2f0b 100644 +--- a/src/polkitbackend/polkitbackendinteractiveauthority.c ++++ b/src/polkitbackend/polkitbackendinteractiveauthority.c +@@ -1293,15 +1293,11 @@ polkit_backend_interactive_authority_get_admin_identities (PolkitBackendInteract + PolkitDetails *details) + { + PolkitBackendInteractiveAuthorityClass *klass; +- GList *ret; ++ GList *ret = NULL; + + klass = POLKIT_BACKEND_INTERACTIVE_AUTHORITY_GET_CLASS (authority); + +- if (klass->get_admin_identities == NULL) +- { +- ret = g_list_prepend (NULL, polkit_unix_user_new (0)); +- } +- else ++ if (klass->get_admin_identities != NULL) + { + ret = klass->get_admin_identities (authority, + caller, +@@ -2257,6 +2253,10 @@ authentication_agent_initiate_challenge (AuthenticationAgent *agent, + } + } + ++ /* Fall back to uid 0 if no users are available (rhbz #834494) */ ++ if (user_identities == NULL) ++ user_identities = g_list_prepend (NULL, polkit_unix_user_new (0)); ++ + session = authentication_session_new (agent, + cookie, + subject, +-- +cgit v0.9.0.2-2-gbebe diff --git a/gnome-unstable/telepathy-glib/PKGBUILD b/gnome-unstable/telepathy-glib/PKGBUILD index 9df1c51b1..04b8976cc 100644 --- a/gnome-unstable/telepathy-glib/PKGBUILD +++ b/gnome-unstable/telepathy-glib/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 166856 2012-09-19 22:53:47Z jgc $ +# $Id: PKGBUILD 167242 2012-09-29 09:23:38Z ibiru $ # Maintainer: Ionut Biru # Contributor: Kessia 'even' Pinheiro pkgname=telepathy-glib -pkgver=0.19.9 +pkgver=0.19.10 pkgrel=1 pkgdesc="GLib bindings for the Telepathy D-Bus protocol" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ options=('!libtool' '!emptydirs') depends=('dbus-glib') makedepends=('libxslt' 'vala' 'gobject-introspection') source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('b1eaad97c9a83df4b364cad468261220') +md5sums=('fbe730cc897c2d6cbf6a165d6cc63cdd') build() { cd $pkgname-$pkgver diff --git a/gnome-unstable/telepathy-mission-control/PKGBUILD b/gnome-unstable/telepathy-mission-control/PKGBUILD new file mode 100644 index 000000000..fc5333e75 --- /dev/null +++ b/gnome-unstable/telepathy-mission-control/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 167244 2012-09-29 09:31:34Z ibiru $ +# Maintainer: Ionut Biru +# Contributor: Ju Liu +# Contributor: Bjorn Lindeijer +# Contributor: Andreas Zwinkau + +pkgname=telepathy-mission-control +pkgver=5.13.2 +pkgrel=1 +pkgdesc="A Telepathy component providing abstraction of some of the details of connection managers." +arch=('i686' 'x86_64') +url="http://telepathy.freedesktop.org/wiki/Mission Control" +license=('LGPL2.1') +depends=('telepathy-glib' 'libgnome-keyring' 'dconf' 'upower' 'networkmanager') +makedepends=('libxslt' 'python2') +install=telepathy-mission-control.install +options=('!libtool') +source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz) +md5sums=('3af60fa448b8fd56b65fac185a41f288') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr \ + --libexecdir=/usr/lib/telepathy \ + --enable-gnome-keyring \ + --disable-schemas-compile + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/gnome-unstable/telepathy-mission-control/telepathy-mission-control.install b/gnome-unstable/telepathy-mission-control/telepathy-mission-control.install new file mode 100644 index 000000000..c25dff2d3 --- /dev/null +++ b/gnome-unstable/telepathy-mission-control/telepathy-mission-control.install @@ -0,0 +1,11 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} -- cgit v1.2.3-54-g00ecf