wip releasing

diff --git a/README b/README
index 806e8bff46d7536828d6fcd5d9d9fcd7073dcf33..a968a8ee92560a59c997c931cbfa5814275a0ae4 100644 (file)
--- a/README
+++ b/README
@@ -25,6 +25,7 @@ ipif          Y Y A   UC create IP interfaces/VPNs (Linux-specific)
 www-cgi                Y B A   UC provide CGIs which run as themselves
 misc/mailq     Y S S   UC list mail queue even if sendmail forbids
 misc/ndc-reload        Y S S   UC reload named after editing own zone files
 www-cgi                Y B A   UC provide CGIs which run as themselves
 misc/mailq     Y S S   UC list mail queue even if sendmail forbids
 misc/ndc-reload        Y S S   UC reload named after editing own zone files

+git-daemon     Y Y Y   UC safely publish git repositories on port 9418

 newsrc-lg      X B X   Acquire list of subscribed groups from .newsrcs
 
 Key to the Status:
 newsrc-lg      X B X   Acquire list of subscribed groups from .newsrcs
 
 Key to the Status:


@@ -47,10 +48,11 @@ Key to the Status:
    S   Too small to need any significant documentation.
 
 userv-utils are
    S   Too small to need any significant documentation.
 
 userv-utils are

-Copyright (C)1996-2000,2003 Ian Jackson <ian@davenant.greenend.org.uk>.
+Copyright (C)1996-2010 Ian Jackson <ian@davenant.greenend.org.uk>.

 Copyright (C)1998 David Damerell <damerell@chiark.greenend.org.uk>
 Copyright (C)1999,2003
    Chancellor Masters and Scholars of the University of Cambridge
 Copyright (C)1998 David Damerell <damerell@chiark.greenend.org.uk>
 Copyright (C)1999,2003
    Chancellor Masters and Scholars of the University of Cambridge

+Copyright (C)2010 Tony Finch <fanf@dotat.at>

 
 All the utilities here are free software.  You can redistribute it
 and/or modify them under the terms of the GNU General Public License
 
 All the utilities here are free software.  You can redistribute it
 and/or modify them under the terms of the GNU General Public License

diff --git a/debian/control b/debian/control
index 3247d90ca4cfa47227a59960082a49d7b8179e66..4f11db81dfbcc32346de077f47d42eb30ec2e405 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -65,6 +65,20 @@ Description: user-controlled group membership
  The default configuration allows users to create and manage a few
  groups, but is reasonably conservative.
 
  The default configuration allows users to create and manage a few
  groups, but is reasonably conservative.
 

+Package: userv-git-daemon
+Architecture: all
+Depends: userv, git-core
+Description: per-user git daemon service
+ userv-git-daemon allows users to publish git repositories which will
+ be published via the git protocol on 9418.  This is a bit like
+ git-daemon except that the actual reading of each user's repositories
+ is done as that user.
+ .
+ The default configuration does nothing: you must (a) manually copy
+ the line from /usr/share/doc/examples/userv-git-daemon.inetd into
+ /etc/inetd.conf and (b) specifically list hostnames and target
+ directories in /etc/userv/git-urlmap.
+

 Package: userv-misc
 Architecture: all
 Depends: userv
 Package: userv-misc
 Architecture: all
 Depends: userv

diff --git a/debian/rules b/debian/rules
index 49772399a7142cf391b227b0816b637568be3bf8..30ec6a340c1495a1739b1b44babf58e1294e3c60 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,9 @@
 #!/usr/bin/make -f
 
 #!/usr/bin/make -f
 

-subdirs_build= ipif www-cgi
+subdirs_build= ipif www-cgi git-daemon

 subdirs_nobuild=dyndns groupmanage misc
 package=       userv-utils
 subdirs_nobuild=dyndns groupmanage misc
 package=       userv-utils

-packages_indep=        userv-dyndns userv-groupmanage userv-misc
+packages_indep=        userv-dyndns userv-groupmanage userv-misc git-daemon

 packages_arch= userv-ipif userv-cgi
 packages=      $(packages_indep) $(packages_arch)
 
 packages_arch= userv-ipif userv-cgi
 packages=      $(packages_indep) $(packages_arch)
 


@@ -71,6 +71,7 @@ binary-hook-userv-groupmanage:
 binary-hook-userv-cgi:
 binary-hook-userv-dyndns:
 binary-hook-userv-ipif:
 binary-hook-userv-cgi:
 binary-hook-userv-dyndns:
 binary-hook-userv-ipif:

+binary-hook-userv-git-daemon:

 
 binary-one:
        set -e; for f in preinst postinst prerm postrm conffiles; do \
 
 binary-one:
        set -e; for f in preinst postinst prerm postrm conffiles; do \