From 9a88a11bfc677870c6cc5b6cae48b794c6285fc1 Mon Sep 17 00:00:00 2001 From: Guido Günther Date: Sun, 13 Mar 2016 13:17:46 +0100 Subject: Point to gnome tarballs --- network-manager-iodine.doap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/network-manager-iodine.doap b/network-manager-iodine.doap index 19be840..b88586e 100644 --- a/network-manager-iodine.doap +++ b/network-manager-iodine.doap @@ -10,7 +10,7 @@ - + -- cgit v1.2.3 From a9a17c632a0ea7aa7146b928fbef7eec2f815032 Mon Sep 17 00:00:00 2001 From: Guido Günther Date: Sun, 13 Mar 2016 13:34:56 +0100 Subject: Update doap information --- network-manager-iodine.doap | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/network-manager-iodine.doap b/network-manager-iodine.doap index b88586e..61e372e 100644 --- a/network-manager-iodine.doap +++ b/network-manager-iodine.doap @@ -7,9 +7,11 @@ network-manager-iodine Iodine support for NetworkManager + Provides connections via DNS tunnels using NetworkManager and Iodine. - + + C -- cgit v1.2.3 From 906f673ab4461cc42a49d7a3b290d2cfa2f403e9 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Fri, 22 Apr 2016 12:29:33 +0200 Subject: build: don't include the full path to a plugin by default Makes packagers a bit less sad. We always keep the full paths in /etc for compatibility. --- Makefile.am | 16 +++++++++++++--- configure.ac | 5 +++++ 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index 24174e0..ad796f9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -17,13 +17,23 @@ nmvpnservicedir = $(NM_VPN_SERVICE_DIR) nmvpnservice_DATA = nm-iodine-service.name if WITH_LIBNM_GLIB -nmvpnoldservicedir = $(sysconfdir)/NetworkManager/VPN -nmvpnoldservice_DATA = nm-iodine-service.name +# Install a file with full path to plugins for an old gnome-shell +# https://bugzilla.gnome.org/show_bug.cgi?id=693590 +install-data-hook: + mkdir -p $(DESTDIR)$(sysconfdir)/NetworkManager/VPN + sed -e "1s|^|# This file is obsoleted by a file in $(NM_VPN_SERVICE_DIR)\n\n|" \ + -e 's|[@]LIBEXECDIR[@]|$(libexecdir)|g' \ + -e 's|[@]PLUGINDIR[@]|$(libdir)/NetworkManager|g' \ + <$(srcdir)/nm-iodine-service.name.in \ + >$(DESTDIR)$(sysconfdir)/NetworkManager/VPN/nm-iodine-service.name + +uninstall-hook: + rm -f $(DESTDIR)$(sysconfdir)/NetworkManager/VPN/nm-iodine-service.name endif nm-iodine-service.name: $(srcdir)/nm-iodine-service.name.in sed -e 's|[@]LIBEXECDIR[@]|$(libexecdir)|g' \ - -e 's|[@]PLUGINDIR[@]|$(libdir)/NetworkManager|g' \ + -e 's|[@]PLUGINDIR[@]/|@NM_PLUGIN_DIR@|g' \ $< >$@ DISTCHECK_CONFIGURE_FLAGS = --enable-more-warnings=yes diff --git a/configure.ac b/configure.ac index 8596102..f19bd4b 100644 --- a/configure.ac +++ b/configure.ac @@ -48,6 +48,8 @@ AM_CONDITIONAL(WITH_AUTHDLG, test x"$with_authdlg" != xno) AC_ARG_WITH(libnm-glib, AS_HELP_STRING([--without-libnm-glib], [Build NetworkManager-iodine without libnm-glib comatibility])) AM_CONDITIONAL(WITH_LIBNM_GLIB, test x"$with_libnm_glib" != xno) +AC_ARG_ENABLE(absolute-paths, AS_HELP_STRING([--enable-absolute-paths], [Use absolute paths to in .name files. Useful for development. (default is no)])) + GETTEXT_PACKAGE=NetworkManager-iodine AC_SUBST(GETTEXT_PACKAGE) AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package]) @@ -81,6 +83,9 @@ LIBNM_CFLAGS="$LIBNM_CFLAGS -DNM_VERSION_MAX_ALLOWED=NM_VERSION_1_2" NM_VPN_SERVICE_DIR=`$PKG_CONFIG pkg-config --define-variable prefix='\${prefix}' --variable vpnservicedir libnm` AC_SUBST(NM_VPN_SERVICE_DIR) +test x"$enable_absolute_paths" = x"yes" && NM_PLUGIN_DIR='$(libdir)/NetworkManager/' +AC_SUBST(NM_PLUGIN_DIR) + NM_COMPILER_WARNINGS AC_CONFIG_FILES([ -- cgit v1.2.3 From 88c24c694d8ef0930e3b025bfc538b166a99e460 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Fri, 22 Apr 2016 13:12:38 +0200 Subject: properties: move the domain beneath a GtkGrid similar to one below ...instead of a GtkTable. This is nothing too impressive, but looks better when strechted on screenshot of a size that AppStream finds acceptable. The third column of the grids could be moved away altogether if the password flag widget was used; but for now this works well. --- properties/nm-iodine-dialog.ui | 57 ++++++++++++++++-------------------------- 1 file changed, 21 insertions(+), 36 deletions(-) diff --git a/properties/nm-iodine-dialog.ui b/properties/nm-iodine-dialog.ui index 1b7d772..d1ef9ee 100644 --- a/properties/nm-iodine-dialog.ui +++ b/properties/nm-iodine-dialog.ui @@ -1,6 +1,7 @@ + - + @@ -29,10 +30,10 @@ True False - 0 General + 0 - + @@ -47,12 +48,11 @@ False 12 - + True False - 2 - 6 6 + 6 True @@ -63,30 +63,32 @@ True True - True • 1 - 2 - + 0 True False - 0 _Toplevel Domain: True topdomain_entry + 0 - + 0 + 0 + + + @@ -112,10 +114,10 @@ True False - 0 Optional + 0 - + @@ -139,32 +141,28 @@ True False - 0 _Nameserver: True nameserver_entry + 0 0 0 - 1 - 1 True False - 0 _Password: True password_entry + 0 0 1 - 1 - 1 @@ -173,29 +171,24 @@ True False ● - True 1 1 - 1 - 1 True False - 0 _Fragment Size: True fragsize_entry + 0 0 3 - 1 - 1 @@ -203,13 +196,10 @@ True True • - True 1 3 - 1 - 1 @@ -217,13 +207,10 @@ True True • - True 1 0 - 1 - 1 @@ -233,15 +220,12 @@ True True False - False 0 True 1 2 - 1 - 1 @@ -259,8 +243,6 @@ 2 1 - 1 - 1 @@ -272,6 +254,9 @@ + + + -- cgit v1.2.3 From 97c13ca6b388df7858f7f1b999f8b3861f0cd254 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Fri, 22 Apr 2016 13:03:13 +0200 Subject: appdata: add AppStream metadata This will ensure the Iodine NetworkManager plugin will be easily installable from the app stores such as GNOME Software. --- .gitignore | 2 ++ Makefile.am | 12 +++++++- appdata/iodine.png | Bin 0 -> 31950 bytes appdata/network-manager-iodine.appdata.xml.in | 39 ++++++++++++++++++++++++++ po/POTFILES.in | 1 + 5 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 appdata/iodine.png create mode 100644 appdata/network-manager-iodine.appdata.xml.in diff --git a/.gitignore b/.gitignore index a4f09a5..c0feb08 100644 --- a/.gitignore +++ b/.gitignore @@ -21,12 +21,14 @@ stamp-* TAGS autom4te.cache intltool-* +po/NetworkManager-iodine.pot po/*.gmo po/.intltool-merge-cache m4/gtk-doc.m4 m4/intltool.m4 m4/libtool.m4 m4/lt*.m4 +network-manager-iodine.appdata.xml nm-iodine-service.name src/nm-iodine-service diff --git a/Makefile.am b/Makefile.am index ad796f9..35a5565 100644 --- a/Makefile.am +++ b/Makefile.am @@ -31,6 +31,11 @@ uninstall-hook: rm -f $(DESTDIR)$(sysconfdir)/NetworkManager/VPN/nm-iodine-service.name endif +appdatadir = $(datadir)/appdata +appdata_DATA = $(appdata_in_files:.xml.in=.xml) +appdata_in_files = appdata/network-manager-iodine.appdata.xml.in +@INTLTOOL_XML_RULE@ + nm-iodine-service.name: $(srcdir)/nm-iodine-service.name.in sed -e 's|[@]LIBEXECDIR[@]|$(libexecdir)|g' \ -e 's|[@]PLUGINDIR[@]/|@NM_PLUGIN_DIR@|g' \ @@ -42,11 +47,16 @@ EXTRA_DIST = nm-iodine-service.name.in \ $(dbusservice_DATA) \ $(desktop_in_files) \ $(icon_DATA) \ + $(appdata_in_files) \ + $(appdata_DATA) \ intltool-extract.in \ intltool-merge.in \ intltool-update.in -CLEANFILES = $(nmvpnservice_DATA) $(desktop_DATA) *~ +CLEANFILES = $(nmvpnservice_DATA) \ + $(desktop_DATA) \ + $(appdata_DATA) + DISTCLEANFILES = intltool-extract intltool-merge intltool-update ACLOCAL_AMFLAGS = -I m4 diff --git a/appdata/iodine.png b/appdata/iodine.png new file mode 100644 index 0000000..ee82651 Binary files /dev/null and b/appdata/iodine.png differ diff --git a/appdata/network-manager-iodine.appdata.xml.in b/appdata/network-manager-iodine.appdata.xml.in new file mode 100644 index 0000000..4286cc9 --- /dev/null +++ b/appdata/network-manager-iodine.appdata.xml.in @@ -0,0 +1,39 @@ + + + + network-manager-iodine + GPL-2.0+ + CC0-1.0 + nm-connection-editor.desktop + gnome-control-center.desktop + <_name>Iodine DNS Tunnel + <_summary>Client for Iodine DNS Tunnel + + + network + manager + NetworkManager + connection + VPN + Iodine + DNS + + + + <_p>Support for tunnelling IP traffic via DNS using Iodine. + <_p>This is useful to get useful connectivity in cases where Internet + access is severely filtered. + + + + + https://git.gnome.org/browse/network-manager-iodine/plain/appdata/iodine.png + + + + https://honk.sigxcpu.org/piki/projects/network-manager-iodine/ + https://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager + agx@sigxcpu.org + NetworkManager-iodine + <_developer_name>Guido Günther + diff --git a/po/POTFILES.in b/po/POTFILES.in index 9b5980e..7dd1feb 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,5 +1,6 @@ # List of source files containing translatable strings. # Please keep this file sorted alphabetically. +appdata/network-manager-iodine.appdata.xml.in auth-dialog/main.c properties/nm-iodine.c [type: gettext/glade]properties/nm-iodine-dialog.ui -- cgit v1.2.3 From 1941852d75827b26142cda627b0c948a27641194 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Fri, 22 Apr 2016 12:33:42 +0200 Subject: release: bump version to 1.2.0 NetworkManager-1.2 is now released; good time for a plugin release as well. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index f19bd4b..4109715 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ AC_PREREQ(2.52) -AC_INIT(NetworkManager-iodine, 1.1.0, agx@sigxcpu.org, NetworkManager-iodine) +AC_INIT(NetworkManager-iodine, 1.2.0, agx@sigxcpu.org, NetworkManager-iodine) AM_INIT_AUTOMAKE([subdir-objects no-dist-gzip dist-xz]) AM_MAINTAINER_MODE -- cgit v1.2.3