hi, please pull

.gitignore

@@ -1,45 +1,34 @@
-# Temporary files
 *~
-*.swp
-
-# Compiled files
 *.o
-*.la
 *.lo
-auth-dialog/nm-l2tp-auth-dialog
-src/nm-l2tp-service
-
-# Generated
-nm-l2tp-service.name
-src/nm-l2tp-pppd-service-glue.h
-
-# GNU Autotools
-.deps
-.libs
+*.la
+Makefile
+Makefile.in*
+configure
+compile
+config.*
 aclocal.m4
-autom4te.cache/
 depcomp
-compile
-config.guess
-config.h
-config.h.in
-config.h~
-config.log
-config.status
-config.sub
-configure
 install-sh
-intltool-extract.in
-intltool-merge.in
-intltool-update.in
 libtool
 ltmain.sh
-m4/
-Makefile
-Makefile.in
 missing
-po/*.pot
-po/Makefile.in.in
-po/POTFILES
-po/stamp-it
-stamp-h1
+mkinstalldirs
+POTFILES
+stamp-*
+.deps
+.libs
+autom4te.cache
+intltool-*
+po/*.gmo
+po/.intltool-merge-cache
+m4/gtk-doc.m4
+m4/intltool.m4
+m4/libtool.m4
+m4/lt*.m4
+
+auth-dialog/nm-l2tp-auth-dialog
+nm-l2tp-service.name
+nm-l2tp.desktop
+src/nm-l2tp-pppd-service-glue.h
+src/nm-l2tp-service

AUTHORS

@@ -1,4 +1,5 @@
 Alexey Torkhov <[email protected]>
+Sergey Prokhorov <[email protected]>
 
 Based on NetworkManager-pptp by:
 Antony Mee <[email protected]>

Makefile.am

@@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = foreign
 SUBDIRS = src
 
 if WITH_GNOME
-SUBDIRS += common-gnome auth-dialog properties po
+SUBDIRS += auth-dialog properties po
 endif
 
 dbusservicedir = $(sysconfdir)/dbus-1/system.d
@@ -27,7 +27,11 @@ if WITH_GNOME
 endif
 
 nm-l2tp-service.name: $(srcdir)/nm-l2tp-service.name.in
-	sed -e 's|[@]LIBEXECDIR[@]|$(libexecdir)|g' $< >$@
+	sed -e 's|[@]LIBEXECDIR[@]|$(libexecdir)|g' \
+	    -e 's|[@]PLUGINDIR[@]|$(libdir)/NetworkManager|g' \
+	    $< >$@
+
+DISTCHECK_CONFIGURE_FLAGS = --enable-more-warnings=yes
 
 EXTRA_DIST = nm-l2tp-service.name.in \
              $(dbusservice_DATA)  \

README

@@ -1 +1,16 @@
 L2TP support for NetworkManager
+===============================
+
+This version has IPSEC support and can connect to a Sonicwall
+
+Uses xl2tpd and (optional) openswan.
+
+Build
+=====
+
+    ./autogen.sh
+    ./configure  # (optional)
+    make
+    sudo make install
+
+Ubuntu users see README.ubuntu file.

README.ubuntu

@@ -0,0 +1,15 @@
+
+The Debian and Ubuntu GNOME packages don't have reasonable defaults,
+so you have to give ./configure every path manually.
+
+  ./configure \
+	--prefix=/usr --localstatedir=/etc --sysconfdir=/etc \
+	--sharedstatedir=/var/lib --libexecdir=/usr/lib/NetworkManager \
+	--infodir=/usr/share/info --mandir=/usr/share/man \
+	--with-pppd-plugin-dir=/usr/lib/pppd/2.4.5 \
+	--with-dist-version=<my_build_ver>
+
+You'll need at least the following installed:
+
+  sudo apt-get install xl2tpd openswan
+

auth-dialog/Makefile.am

@@ -3,28 +3,24 @@ INCLUDES = -I${top_srcdir}
 libexec_PROGRAMS = nm-l2tp-auth-dialog
 
 nm_l2tp_auth_dialog_CPPFLAGS =			\
-	$(NM_UTILS_CFLAGS)			\
-	$(GTHREAD_CFLAGS)			\
+	$(NM_CFLAGS)		\
+	$(GLIB_CFLAGS)			\
 	$(GTK_CFLAGS)				\
-	$(GCONF_CFLAGS)				\
 	$(GNOMEKEYRING_CFLAGS)			\
 	-DICONDIR=\""$(datadir)/pixmaps"\"	\
-	-DGLADEDIR=\""$(gladedir)"\"		\
+	-DUIDIR=\""$(uidir)"\"			\
 	-DBINDIR=\""$(bindir)"\"		\
 	-DG_DISABLE_DEPRECATED			\
-	-DGDK_DISABLE_DEPRECATED		\
-	-DGNOME_DISABLE_DEPRECATED		\
-	-DGNOMELOCALEDIR=\"$(datadir)/locale\"	\
 	-DVERSION=\"$(VERSION)\"
 
 nm_l2tp_auth_dialog_SOURCES =			\
-	main.c					\
-	gnome-two-password-dialog.c		\
-	gnome-two-password-dialog.h
+	main.c \
+	vpn-password-dialog.c \
+	vpn-password-dialog.h
 
 nm_l2tp_auth_dialog_LDADD =			\
-	$(GTK_LIBS)				\
-	$(GCONF_LIBS)				\
-	$(top_builddir)/common-gnome/libnm-l2tp-common-gnome.la
+	$(NM_LIBS) \
+	$(GTK_LIBS) \
+	$(GNOMEKEYRING_LIBS)
 
 CLEANFILES = *~