diff options
author | Oskari Rauta | 2016-09-07 20:55:45 +0300 |
---|---|---|
committer | Oskari Rauta | 2016-09-07 20:55:45 +0300 |
commit | 4ae52abec52095a02636d8d16fb5b64a9b1cf4a3 (patch) | |
tree | 85a7e4fbd76fa9c8d81e15e2e6ad990fb0c9e022 | |
download | aur-4ae52abec52095a02636d8d16fb5b64a9b1cf4a3.tar.gz |
Initial commit
-rw-r--r-- | .SRCINFO | 48 | ||||
-rw-r--r-- | PKGBUILD | 86 | ||||
-rw-r--r-- | enable-local-password-storage.patch | 87 | ||||
-rw-r--r-- | enable-new-connections-for-everyone-as-default.patch | 24 |
4 files changed, 245 insertions, 0 deletions
diff --git a/.SRCINFO b/.SRCINFO new file mode 100644 index 000000000000..0cbf2ad31850 --- /dev/null +++ b/.SRCINFO @@ -0,0 +1,48 @@ +pkgbase = network-manager-applet-passwordstore + pkgdesc = Applet for managing network connections with default setting to save authentication passwords in keyfile and make all new connections available for all users + pkgver = 1.4.0 + pkgrel = 1 + url = https://wiki.gnome.org/Projects/NetworkManager/ + arch = i686 + arch = x86_64 + license = GPL2 + license = LGPL2.1 + makedepends = libsecret + makedepends = libnotify + makedepends = libmm-glib + makedepends = intltool + makedepends = gobject-introspection + depends = libnm-glib + depends = libgudev + depends = gtk3 + depends = mobile-broadband-provider-info + depends = iso-codes + provides = nm-connection-editor=- + provides = network-manager-applet=- + conflicts = nm-connection-editor + conflicts = network-manager-applet + options = !emptydirs + source = http://ftp.gnome.org/pub/GNOME/sources/network-manager-applet-passwordstore/1.4/network-manager-applet-passwordstore-1.4.0.tar.xz + source = enable-local-password-storage.patch + source = enable-new-connections-for-everyone-as-default.patch + sha256sums = d9f5f1e151b8edbbcebb6f818eed9a49b53aadcb4e8aed2cae4fc09996278331 + sha256sums = ae7232742e24d87c664479dac655c93a76db8dbbe52359144de21f573ed784c8 + sha256sums = b4c585b9beaac036e2b441d8952a99dd9f2532eeb3ba50081ca69761ffb40439 + +pkgname = nm-connection-editor-passwordstore + pkgdesc = NetworkManager GUI connection editor with default settings to save authentication passwords in keyfile and make all new connections available for all users + provides = libnm-gtk=1.4.0-1 + provides = nm-connection-editor=1.4.0-1 + conflicts = libnm-gtk + conflicts = nm-connection-editor + replaces = libnm-gtk + +pkgname = network-manager-applet-passwordstore + pkgdesc = Applet for managing network connections with default setting to save authentication passwords in keyfile and make all new connections available for all users + depends = nm-connection-editor-passwordstore + depends = libmm-glib + depends = libnotify + depends = libsecret + provides = network-manager-applet=1.4.0-1 + conflicts = network-manager-applet + diff --git a/PKGBUILD b/PKGBUILD new file mode 100644 index 000000000000..1f76d512becf --- /dev/null +++ b/PKGBUILD @@ -0,0 +1,86 @@ +# $Id$ +# Maintainer: Oskari Rauta <oskari.rauta dot gmail.com> + +pkgbase=network-manager-applet-passwordstore +pkgname=(nm-connection-editor-passwordstore network-manager-applet-passwordstore) +pkgdesc="Applet for managing network connections with default setting to save authentication passwords in keyfile and make all new connections available for all users" +conflicts=('nm-connection-editor' 'network-manager-applet') +provides=("nm-connection-editor=$pkgver-$pkgrel" "network-manager-applet=$pkgver-$pkgrel") +url="https://wiki.gnome.org/Projects/NetworkManager/" +pkgver=1.4.0 +pkgrel=1 +arch=(i686 x86_64) +license=(GPL2 LGPL2.1) +depends=(libnm-glib libgudev gtk3 mobile-broadband-provider-info iso-codes) +makedepends=(libsecret libnotify libmm-glib intltool gobject-introspection) +options=(!emptydirs) +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgbase/${pkgver:0:3}/$pkgbase-$pkgver.tar.xz + enable-local-password-storage.patch + enable-new-connections-for-everyone-as-default.patch) +sha256sums=('d9f5f1e151b8edbbcebb6f818eed9a49b53aadcb4e8aed2cae4fc09996278331' + 'ae7232742e24d87c664479dac655c93a76db8dbbe52359144de21f573ed784c8' + 'b4c585b9beaac036e2b441d8952a99dd9f2532eeb3ba50081ca69761ffb40439') + +prepare() { + mkdir -p nma/etc/xdg nma/usr/bin \ + nma/usr/share/{applications,icons/hicolor/22x22/apps,man/man1,nm-applet} + cd $pkgbase-$pkgver + patch -p1 -i ../enable-new-connections-for-everyone-as-default.patch + patch -p1 -i ../enable-local-password-storage.patch +} + +build() { + cd $pkgbase-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var \ + --libexecdir=/usr/lib/networkmanager \ + --disable-static \ + --disable-maintainer-mode \ + --disable-migration \ + --with-modem-manager-1 + + # https://bugzilla.gnome.org/show_bug.cgi?id=655517 + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + + make +} + +check() { + cd $pkgbase-$pkgver + make -k check +} + +package_nm-connection-editor-passwordstore() { + pkgdesc="NetworkManager GUI connection editor with default settings to save authentication passwords in keyfile and make all new connections available for all users" + provides=("libnm-gtk=$pkgver-$pkgrel" "nm-connection-editor=$pkgver-$pkgrel") + conflicts=('libnm-gtk' 'nm-connection-editor') + replaces=('libnm-gtk') + + cd $pkgbase-$pkgver + make DESTDIR="$pkgdir" install + +### Split network-manager-applet + cd ../nma + mv "$pkgdir"/etc/xdg/autostart etc/xdg/ + mv "$pkgdir"/usr/bin/nm-applet usr/bin/ + mv "$pkgdir"/usr/share/GConf usr/share/ + + cd usr/share + mv "$pkgdir"/usr/share/applications/nm-applet.desktop applications/ + mv "$pkgdir"/usr/share/man/man1/nm-applet.1 man/man1/ + mv "$pkgdir"/usr/share/nm-applet/{{8021x,gsm-unlock,info}.ui,keyring.png} nm-applet/ + + cd icons/hicolor/22x22 + mv "$pkgdir"/usr/share/icons/hicolor/22x22/apps/nm-{adhoc,mb-roam,wwan-tower}.png apps/ + mv "$pkgdir"/usr/share/icons/hicolor/22x22/apps/nm-{secure,vpn-active}-lock.png apps/ + mv "$pkgdir"/usr/share/icons/hicolor/22x22/apps/nm-{signal,tech}-*.png apps/ + mv "$pkgdir"/usr/share/icons/hicolor/22x22/apps/nm-*connecting*.png apps/ +} + +package_network-manager-applet-passwordstore() { + pkgdesc="Applet for managing network connections with default setting to save authentication passwords in keyfile and make all new connections available for all users" + provides=("network-manager-applet=$pkgver-$pkgrel") + depends=('nm-connection-editor-passwordstore' 'libmm-glib' 'libnotify' 'libsecret') + conflicts=('network-manager-applet') + mv nma/* "$pkgdir" +} diff --git a/enable-local-password-storage.patch b/enable-local-password-storage.patch new file mode 100644 index 000000000000..22ff682c81a1 --- /dev/null +++ b/enable-local-password-storage.patch @@ -0,0 +1,87 @@ +diff -Naur network-manager-applet-1.4.0.orig/src/wireless-security/eap-method-leap.c network-manager-applet-1.4.0/src/wireless-security/eap-method-leap.c +--- network-manager-applet-1.4.0.orig/src/wireless-security/eap-method-leap.c 2016-07-25 14:41:01.000000000 +0300 ++++ network-manager-applet-1.4.0/src/wireless-security/eap-method-leap.c 2016-09-07 00:42:00.956063332 +0300 +@@ -119,9 +119,11 @@ + secret_flags, NULL); + + /* Update secret flags and popup when editing the connection */ +- if (method->editing_connection) ++ if (method->editing_connection) { + nma_utils_update_password_storage (passwd_entry, secret_flags, + NM_SETTING (s_8021x), parent->password_flags_name); ++ g_object_set (s_8021x, NM_SETTING_802_1X_PASSWORD_FLAGS, NM_SETTING_SECRET_FLAG_NONE, NULL); ++ } + } + + static void +diff -Naur network-manager-applet-1.4.0.orig/src/wireless-security/eap-method-simple.c network-manager-applet-1.4.0/src/wireless-security/eap-method-simple.c +--- network-manager-applet-1.4.0.orig/src/wireless-security/eap-method-simple.c 2016-07-25 14:41:01.000000000 +0300 ++++ network-manager-applet-1.4.0/src/wireless-security/eap-method-simple.c 2016-09-07 00:44:31.236065406 +0300 +@@ -181,6 +181,7 @@ + + nma_utils_update_password_storage (passwd_entry, flags, + NM_SETTING (s_8021x), parent->password_flags_name); ++ g_object_set (s_8021x, NM_SETTING_802_1X_PASSWORD_FLAGS, NM_SETTING_SECRET_FLAG_NONE, NULL); + } + } + +diff -Naur network-manager-applet-1.4.0.orig/src/wireless-security/eap-method-tls.c network-manager-applet-1.4.0/src/wireless-security/eap-method-tls.c +--- network-manager-applet-1.4.0.orig/src/wireless-security/eap-method-tls.c 2016-07-25 14:41:01.000000000 +0300 ++++ network-manager-applet-1.4.0/src/wireless-security/eap-method-tls.c 2016-09-07 00:50:17.012736832 +0300 +@@ -177,6 +177,7 @@ + const char *password = NULL; + GError *error = NULL; + gboolean ca_cert_error = FALSE; ++ const char *secret_flag_prop = NULL; + + s_8021x = nm_connection_get_setting_802_1x (connection); + g_assert (s_8021x); +@@ -207,11 +208,13 @@ + g_warning ("Couldn't read phase2 private key '%s': %s", pk_filename, error ? error->message : "(unknown)"); + g_clear_error (&error); + } ++ secret_flag_prop = NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS; + } else { + if (!nm_setting_802_1x_set_private_key (s_8021x, pk_filename, password, NM_SETTING_802_1X_CK_SCHEME_PATH, &format, &error)) { + g_warning ("Couldn't read private key '%s': %s", pk_filename, error ? error->message : "(unknown)"); + g_clear_error (&error); + } ++ secret_flag_prop = NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS; + } + g_free (pk_filename); + +@@ -224,6 +227,7 @@ + if (method->editing_connection) { + nma_utils_update_password_storage (passwd_entry, secret_flags, + NM_SETTING (s_8021x), parent->password_flags_name); ++ g_object_set (s_8021x, secret_flag_prop, NM_SETTING_SECRET_FLAG_NONE, NULL); + } + + /* TLS client certificate */ +diff -Naur network-manager-applet-1.4.0.orig/src/wireless-security/ws-leap.c network-manager-applet-1.4.0/src/wireless-security/ws-leap.c +--- network-manager-applet-1.4.0.orig/src/wireless-security/ws-leap.c 2016-07-25 14:41:01.000000000 +0300 ++++ network-manager-applet-1.4.0/src/wireless-security/ws-leap.c 2016-09-07 00:52:11.662738418 +0300 +@@ -125,9 +125,11 @@ + secret_flags, NULL); + + /* Update secret flags and popup when editing the connection */ +- if (sec->editing_connection) ++ if (sec->editing_connection) { + nma_utils_update_password_storage (passwd_entry, secret_flags, + NM_SETTING (s_wireless_sec), sec->password_flags_name); ++ g_object_set (s_wireless_sec, NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS, NM_SETTING_SECRET_FLAG_NONE, NULL); ++ } + } + + static void +--- network-manager-applet-1.4.0/src/wireless-security/wireless-security.c.orig 2016-09-07 01:14:47.512757117 +0300 ++++ network-manager-applet-1.4.0/src/wireless-security/wireless-security.c 2016-09-07 01:15:19.869424223 +0300 +@@ -541,7 +541,7 @@ + if (s_8021x) + nm_setting_get_secret_flags (NM_SETTING (s_8021x), eap->password_flags_name, &secret_flags, NULL); + else +- secret_flags = NM_SETTING_SECRET_FLAG_AGENT_OWNED; ++ secret_flags = NM_SETTING_SECRET_FLAG_NONE; + + /* Blow away the old wireless security setting by adding a clear one */ + s_wireless_sec = (NMSettingWirelessSecurity *) nm_setting_wireless_security_new (); diff --git a/enable-new-connections-for-everyone-as-default.patch b/enable-new-connections-for-everyone-as-default.patch new file mode 100644 index 000000000000..080a0d867c05 --- /dev/null +++ b/enable-new-connections-for-everyone-as-default.patch @@ -0,0 +1,24 @@ +--- network-manager-applet-1.4.0/src/applet-device-wifi.c.orig 2016-09-06 23:47:42.579351733 +0300 ++++ network-manager-applet-1.4.0/src/applet-device-wifi.c 2016-09-06 23:48:23.779352302 +0300 +@@ -539,7 +539,7 @@ + + /* Make the new connection available only for the current user */ + s_con = (NMSettingConnection *) nm_setting_connection_new (); +- nm_setting_connection_add_permission (s_con, "user", g_get_user_name (), NULL); ++ // nm_setting_connection_add_permission (s_con, "user", g_get_user_name (), NULL); + nm_connection_add_setting (connection, NM_SETTING (s_con)); + + ssid = nm_access_point_get_ssid (ap); +--- network-manager-applet-1.4.0/src/mobile-helpers.c.orig 2016-09-06 23:51:40.702688353 +0300 ++++ network-manager-applet-1.4.0/src/mobile-helpers.c 2016-09-06 23:52:05.179355356 +0300 +@@ -219,8 +219,8 @@ + NM_SETTING_CONNECTION_UUID, uuid, + NULL); + /* Make the new connection available only for the current user */ +- nm_setting_connection_add_permission ((NMSettingConnection *) setting, +- "user", g_get_user_name (), NULL); ++ //nm_setting_connection_add_permission ((NMSettingConnection *) setting, ++ // "user", g_get_user_name (), NULL); + g_free (uuid); + g_free (id); + nm_connection_add_setting (connection, setting); |