Permalink
Browse files

Merge branch 'master' of git@github.com:ryd/chaosvpn

  • Loading branch information...
hce committed Dec 12, 2009
2 parents b913e6b + f4a864b commit 2a9811a68685287f82eeb32cdf90b6f448a31457
Showing with 572 additions and 3 deletions.
  1. +1 −1 .gitignore
  2. +8 −1 Makefile
  3. +1 −1 README
  4. +6 −0 debian/.gitignore
  5. +14 −0 debian/README.source
  6. +1 −0 debian/compat
  7. +25 −0 debian/control
  8. +40 −0 debian/copyright
  9. +7 −0 debian/cron.d
  10. +14 −0 debian/default
  11. +2 −0 debian/dirs
  12. +1 −0 debian/docs
  13. +274 −0 debian/init.d
  14. +1 −0 debian/manpages
  15. +2 −0 debian/patches/series
  16. +39 −0 debian/postinst
  17. +37 −0 debian/postrm.ex
  18. +35 −0 debian/preinst.ex
  19. +38 −0 debian/prerm.ex
  20. +26 −0 debian/rules
View
@@ -10,4 +10,4 @@ foobar*
up.sh
.cproject
.project
-
+changelog
View
@@ -27,7 +27,14 @@ lex.yy.c: cvconf.l
$(LEX) cvconf.l
clean:
- rm -f *.o y.tab.c y.tab.h lex.yy.c string/*.o $(NAME)
+ rm -f *.o y.tab.c y.tab.h lex.yy.c string/*.o $(NAME)
+
+changelog:
+ [ -e .git/HEAD ] && git log >changelog
+
+install:
+ install -m 0600 chaosvpn.conf $(DESTDIR)/etc/tinc/
+ install -m 0755 chaosvpn $(DESTDIR)/usr/sbin/
splint:
splint +posixlib +allglobals -type -mayaliasunique *.[ch]
View
2 README
@@ -5,7 +5,7 @@ the "old" ChaosVPN from 2006.
The ChaosVPN is a intended VPN to connect Chaos. First services
that will use it will be the warzone project and ChaosPhone.
-You will find some more information at: (german)
+You will find some more information at: (German)
http://wiki.hamburg.ccc.de/index.php/ChaosVPN#ChaosVPN_2.0
Further information will come.
View
@@ -0,0 +1,6 @@
+files
+chaosvpn.debhelper.log
+chaosvpn.postinst.debhelper
+chaosvpn.postrm.debhelper
+chaosvpn.prerm.debhelper
+chaosvpn.substvars
View
@@ -0,0 +1,14 @@
+chaosvpn for Debian
+-------------------
+
+This package uses quilt to manage all modifications to the upstream
+source. Changes are stored in the source package as diffs in
+debian/patches and applied during the build. Please see:
+
+ /usr/share/doc/quilt/README.source
+
+for more information on how to apply the patches, modify patches, or
+remove a patch.
+
+
+
View
@@ -0,0 +1 @@
+7
View
@@ -0,0 +1,25 @@
+Source: chaosvpn
+Section: net
+Priority: extra
+Maintainer: Sven-Haegar Koch <haegar@sdinet.de>
+Build-Depends: quilt (>= 0.46-7~), debhelper (>= 7.0.50~), libcurl4-openssl-dev
+Standards-Version: 3.8.3
+Homepage: http://github.com/ryd/chaosvpn
+
+Package: chaosvpn
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: tinc (>= 1.0.11)
+Description: Client to setup connection to ChaosVPN
+ This VPN is also known as KrautVPN. It is intended to replace
+ the "old" ChaosVPN from 2006.
+ .
+ The ChaosVPN is a intended VPN to connect Chaos. First services
+ that will use it will be the warzone project and ChaosPhone.
+ .
+ You will find some more information at: (German)
+ http://wiki.hamburg.ccc.de/index.php/ChaosVPN#ChaosVPN_2.0
+ .
+ Further information will come.
+ .
+ Go to 26c3 Congress
View
@@ -0,0 +1,40 @@
+This work was packaged for Debian by:
+
+ Sven-Haegar Koch <haegar@sdinet.de> on Sat, 12 Dec 2009 01:28:08 +0100
+
+It was downloaded from http://github.com/ryd/chaosvpn
+
+Upstream Author(s):
+
+ [put author's name and email here]
+ [likewise for another author]
+
+Copyright:
+
+ [Copyright (C) YYYY Name OfAuthor]
+ [likewise for another author]
+
+License:
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+On Debian systems, the complete text of the Apache version 2.0 license
+can be found in `/usr/share/common-licenses/Apache-2.0'.
+
+The Debian packaging is:
+
+ Copyright (C) 2009 Sven-Haegar Koch <haegar@sdinet.de>
+
+and is licensed under the Apache version 2.0 license,
+see `/usr/share/common-licenses/Apache-2.0'.
+
View
@@ -0,0 +1,7 @@
+#
+# Regular cron jobs for the chaosvpn package
+#
+0 4,11 * * * root [ -x /etc/init.d/chaosvpn ] && invoke-rc.d chaosvpn restart
+
+# TODO: do not run at a fixed some, add some random to avoid
+# all clients hitting the server at the same time
View
@@ -0,0 +1,14 @@
+# Defaults for chaosvpn initscript
+# sourced by /etc/init.d/chaosvpn
+# installed at /etc/default/chaosvpn by the maintainer scripts
+
+#
+# This is a POSIX shell fragment
+#
+
+# Additional options that are passed to the Daemon.
+DAEMON_OPTS="-a"
+# -a == do not run as daemon, do not control tincd
+
+# should we start automatically at boot?
+RUN="yes"
View
@@ -0,0 +1,2 @@
+/etc/tinc
+/usr/sbin
View
@@ -0,0 +1 @@
+README
Oops, something went wrong.

0 comments on commit 2a9811a

Please sign in to comment.