diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..0778aed --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "upstream"] + path = upstream + url = git://git.infradead.org/users/dwmw2/openconnect.git diff --git a/openconnect-3.15.tar.gz b/openconnect-3.15.tar.gz deleted file mode 100644 index 2def1a5..0000000 Binary files a/openconnect-3.15.tar.gz and /dev/null differ diff --git a/openconnect.changes b/openconnect.changes deleted file mode 100644 index f42baba..0000000 --- a/openconnect.changes +++ /dev/null @@ -1,88 +0,0 @@ -* Thu Mar 15 2012 Marko Saukko - 3.15 -- Update to version 3.15 -- Added .yaml for spectacle -- Added docs subpackage. - -* Mon May 09 2011 David Woodhouse - 3.02 -- Update to 3.02 to export libopenconnect for GUI authentication - -* Wed Sep 22 2010 David Woodhouse - 2.26 -- Update to 2.26 to fix BMC #8445 BMC #8448 BMC #8442 - -* Fri Aug 27 2010 David Woodhouse - 2.25 -- Update to 2.25 - -* Tue Apr 20 2010 David Woodhouse - 2.22-$DEITYKNOWS -- Add workaround for bug #918 (gconf threading issues) - -* Wed Mar 24 2010 David Woodhouse - 2.22-1 -- Update to 2.22. -- Split nm-auth-dialog into separate subpackage to avoid GTK+ dependency - -* Tue Jan 12 2010 David Woodhouse - 2.21-1 -- Update to 2.21. - -* Mon Jan 4 2010 David Woodhouse - 2.20-1 -- Update to 2.20. - -* Mon Dec 7 2009 David Woodhouse 2.12-1 -- Update to 2.12. - -* Mon Dec 7 2009 David Woodhouse 2.10-2 -- Fix user-agent buffer overflow. - -* Sat Dec 5 2009 David Woodhouse 2.10-1 -- Update to 2.10. - -* Wed Aug 26 2009 Jian-feng Ding 2.01 -- Update to 2.01. - -* Wed Jun 3 2009 David Woodhouse - 2.00-1 -- Update to 2.00. - -* Fri May 8 2009 David Woodhouse - 1.20-1 -- Update to 1.20. - -* Wed Mar 18 2009 David Woodhouse - 1.00-1 -- Update to 1.00. - -* Tue Dec 16 2008 David Woodhouse - 0.99-1 -- Update to 0.99. -- Fix BuildRequires - -* Mon Nov 24 2008 David Woodhouse - 0.98-1 -- Update to 0.98. - -* Thu Nov 13 2008 David Woodhouse - 0.97-1 -- Update to 0.97. Add man page, validate server certs. - -* Tue Oct 28 2008 David Woodhouse - 0.96-1 -- Update to 0.96. Handle split-includes, MacOS port, more capable SecurID. - -* Thu Oct 09 2008 David Woodhouse - 0.95-1 -- Update to 0.95. A few bug fixes. - -* Thu Oct 09 2008 David Woodhouse - 0.94-3 -- Include COPYING.LGPL file - -* Mon Oct 07 2008 David Woodhouse - 0.94-2 -- Fix auth-dialog crash - -* Mon Oct 06 2008 David Woodhouse - 0.94-1 -- Take cookie on stdin so it's not visible in ps. -- Support running 'script' and passing traffic to it via a socket -- Fix abort when fetching XML config fails - -* Sun Oct 05 2008 David Woodhouse - 0.93-1 -- Work around unexpected disconnection (probably OpenSSL bug) -- Handle host list and report errors in NM auth dialog - -* Sun Oct 05 2008 David Woodhouse - 0.92-1 -- Rename to 'openconnect' -- Include NetworkManager auth helper - -* Thu Oct 02 2008 David Woodhouse - 0.91-1 -- Update to 0.91 - -* Thu Oct 02 2008 David Woodhouse - 0.90-1 -- First package diff --git a/openconnect.yaml b/openconnect.yaml deleted file mode 100644 index 820e223..0000000 --- a/openconnect.yaml +++ /dev/null @@ -1,40 +0,0 @@ -Name: openconnect -Summary: Open client for Cisco AnyConnect VPN -Version: 3.15 -Release: 1 -Group: Applications/Internet -License: LGPLv2+ -URL: http://www.infradead.org/openconnect.html -Sources: - - ftp://ftp.infradead.org/pub/openconnect/openconnect-%{version}.tar.gz -Description: | - This package provides a client for Cisco's "AnyConnect" VPN, which uses - HTTPS and DTLS protocols. - -Requires: - - vpnc -PkgBR: - - libproxy-devel - - gettext -PkgConfigBR: - - libxml-2.0 - - openssl -Configure: configure -Builder: make -LocaleName: "%{name}" -SubPackages: - - Name: devel - Summary: Development package for OpenConnect VPN authentication tools - Group: Applications/Internet - Description: | - This package provides the core HTTP and authentication support from - the OpenConnect VPN client, to be used by GUI authentication dialogs - for NetworkManager etc. - Provides: - - openconnect-devel-static = %{version}-%{release} - - - Name: docs - Summary: Documentation package for OpenConnect VPN authentication tools - Group: Applications/Internet - Description: | - This package provides documentation for openconnect, such as man pages. diff --git a/openconnect.spec b/rpm/openconnect.spec similarity index 79% rename from openconnect.spec rename to rpm/openconnect.spec index 68ec222..d011bb1 100644 --- a/openconnect.spec +++ b/rpm/openconnect.spec @@ -1,20 +1,13 @@ -# -# Do NOT Edit the Auto-generated Part! -# Generated by: spectacle version 0.23 -# -# >> macros -# << macros %define keepstatic 1 Name: openconnect Summary: Open client for Cisco AnyConnect VPN -Version: 3.15 +Version: 3.16 Release: 1 Group: Applications/Internet License: LGPLv2+ URL: http://www.infradead.org/openconnect.html Source0: ftp://ftp.infradead.org/pub/openconnect/openconnect-%{version}.tar.gz -Source100: openconnect.yaml Requires: vpnc Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig @@ -23,13 +16,10 @@ BuildRequires: pkgconfig(openssl) BuildRequires: libproxy-devel BuildRequires: gettext - %description This package provides a client for Cisco's "AnyConnect" VPN, which uses HTTPS and DTLS protocols. - - %package devel Summary: Development package for OpenConnect VPN authentication tools Group: Applications/Internet @@ -41,7 +31,6 @@ This package provides the core HTTP and authentication support from the OpenConnect VPN client, to be used by GUI authentication dialogs for NetworkManager etc. - %package docs Summary: Documentation package for OpenConnect VPN authentication tools Group: Applications/Internet @@ -50,69 +39,40 @@ Requires: %{name} = %{version}-%{release} %description docs This package provides documentation for openconnect, such as man pages. - - %prep -%setup -q -n %{name}-%{version} - -# >> setup -# << setup +%setup -q -n %{name}-%{version}/upstream %build -# >> build pre -autoreconf -f -i -# << build pre - -%configure +./autogen.sh +%configure make %{?jobs:-j%jobs} -# >> build post -# << build post %install rm -rf %{buildroot} -# >> install pre -# << install pre %make_install +rm -rf %{buildroot}%{_datadir}/openconnect -# >> install post -# << install post %find_lang %{name} - - %post -p /sbin/ldconfig %postun -p /sbin/ldconfig - - - - - - - %files -f %{name}.lang %defattr(-,root,root,-) -# >> files %{_libdir}/libopenconnect.so.* %{_sbindir}/openconnect %doc COPYING.LGPL -# << files - %files devel %defattr(-,root,root,-) -# >> files devel %doc TODO openconnect.html %{_libdir}/libopenconnect.so %{_libdir}/libopenconnect.a %{_includedir}/openconnect.h %{_libdir}/pkgconfig/openconnect.pc -# << files devel %files docs %defattr(-,root,root,-) -# >> files docs %{_mandir}/man8/* -# << files docs diff --git a/upstream b/upstream new file mode 160000 index 0000000..6668456 --- /dev/null +++ b/upstream @@ -0,0 +1 @@ +Subproject commit 666845605a75901706fce52b9a4e1cd44cc04126