9 files changed, 35 insertions, 10 deletions

diff --git a/Makefile b/Makefile
index ebf8f03..fe4b10e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,3 @@
-CGIT_VERSION = v0.8.3.3
+CGIT_VERSION = v0.8.3.4
 CGIT_SCRIPT_NAME = cgit.cgi
 CGIT_SCRIPT_PATH = /var/www/htdocs/cgit
@@ -80,5 +80,5 @@ endif
 #
 %.d: %.c
-        $(QUIET_MM)$(CC) $(CFLAGS) -MM $< | sed -e 's/\($*\)\.o:/\1.o $@:/g' >$@
+        $(QUIET_MM)$(CC) $(CFLAGS) -MM -MP $< | sed -e 's/\($*\)\.o:/\1.o $@:/g' >$@
 
 #
@@ -140,4 +140,6 @@ CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"'
 CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"'
 
+GIT_OPTIONS = prefix=/usr
+
 ifdef NO_ICONV
         CFLAGS += -DNO_ICONV
diff --git a/README b/README
index 73ec332..050e21e 100644
--- a/README
+++ b/README
@@ -50,5 +50,5 @@ like this:
   <Directory "/var/www/htdocs/cgit/">
       AllowOverride None
-      Options ExecCGI
+      Options +ExecCGI
       Order allow,deny
       Allow from all
diff --git a/cgit.c b/cgit.c
index 96900bb..412fbf0 100644
--- a/cgit.c
+++ b/cgit.c
@@ -122,4 +122,6 @@ void config_cb(const char *name, const char *value)
         else if (!strcmp(name, "module-link"))
                 ctx.cfg.module_link = xstrdup(value);
+        else if (!strcmp(name, "strict-export"))
+                ctx.cfg.strict_export = xstrdup(value);
         else if (!strcmp(name, "virtual-root")) {
                 ctx.cfg.virtual_root = trim_end(value, '/');
diff --git a/cgit.h b/cgit.h
index 8f5dd2a..f5f68ac 100644
--- a/cgit.h
+++ b/cgit.h
@@ -177,4 +177,5 @@ struct cgit_config {
         char *section;
         char *virtual_root;
+        char *strict_export;
         int cache_size;
         int cache_dynamic_ttl;
@@ -294,5 +295,6 @@ extern void cgit_diff_tree(const unsigned char *old_sha1,
                            filepair_fn fn, const char *prefix, int ignorews);
 
-extern void cgit_diff_commit(struct commit *commit, filepair_fn fn);
+extern void cgit_diff_commit(struct commit *commit, filepair_fn fn,
+                             const char *prefix);
 
 __attribute__((format (printf,1,2)))
diff --git a/cgitrc.5.txt b/cgitrc.5.txt
index ea1b18a..8e51ca5 100644
--- a/cgitrc.5.txt
+++ b/cgitrc.5.txt
@@ -318,4 +318,11 @@ summary-tags::
         view. Default value: "10".
 
+strict-export::
+        Filename which, if specified, needs to be present within the repository
+        for cgit to allow access to that repository. This can be used to emulate
+        gitweb's EXPORT_OK and STRICT_EXPORT functionality and limit cgit's
+        repositories to match those exported by git-daemon. This option MUST come
+        before 'scan-path'.
+
 virtual-root::
         Url which, if specified, will be used as root for all cgit links. It
diff --git a/scan-tree.c b/scan-tree.c
index b5b50f3..a0e09ce 100644
--- a/scan-tree.c
+++ b/scan-tree.c
@@ -82,4 +82,8 @@ static void add_repo(const char *base, const char *path, repo_config_fn fn)
                 return;
         }
+
+        if (ctx.cfg.strict_export && stat(fmt("%s/%s", path, ctx.cfg.strict_export), &st))
+                return;
+
         if (!stat(fmt("%s/noweb", path), &st))
                 return;
diff --git a/shared.c b/shared.c
index 72ac140..765cd27 100644
--- a/shared.c
+++ b/shared.c
@@ -339,5 +339,5 @@ void cgit_diff_tree(const unsigned char *old_sha1,
 }
 
-void cgit_diff_commit(struct commit *commit, filepair_fn fn)
+void cgit_diff_commit(struct commit *commit, filepair_fn fn, const char *prefix)
 {
         unsigned char *old_sha1 = NULL;
@@ -345,5 +345,5 @@ void cgit_diff_commit(struct commit *commit, filepair_fn fn)
         if (commit->parents)
                 old_sha1 = commit->parents->item->object.sha1;
-        cgit_diff_tree(old_sha1, commit->object.sha1, fn, NULL,
+        cgit_diff_tree(old_sha1, commit->object.sha1, fn, prefix,
                        ctx.qry.ignorews);
 }
diff --git a/ui-atom.c b/ui-atom.c
index 9f049ae..b218456 100644
--- a/ui-atom.c
+++ b/ui-atom.c
@@ -25,5 +25,5 @@ void add_entry(struct commit *commit, char *host)
         html("</title>\n");
         html("<updated>");
-        cgit_print_date(info->author_date, FMT_ATOMDATE, ctx.cfg.local_time);
+        cgit_print_date(info->committer_date, FMT_ATOMDATE, 0);
         html("</updated>\n");
         html("<author>\n");
@@ -50,5 +50,5 @@ void add_entry(struct commit *commit, char *host)
         html("</author>\n");
         html("<published>");
-        cgit_print_date(info->author_date, FMT_ATOMDATE, ctx.cfg.local_time);
+        cgit_print_date(info->author_date, FMT_ATOMDATE, 0);
         html("</published>\n");
         if (host) {
@@ -112,4 +112,12 @@ void cgit_print_atom(char *tip, char *path, int max_count)
         html("<title>");
         html_txt(ctx.repo->name);
+        if (path) {
+                html("/");
+                html_txt(path);
+        }
+        if (tip && !ctx.qry.show_all) {
+                html(", branch ");
+                html_txt(tip);
+        }
         html("</title>\n");
         html("<subtitle>");
diff --git a/ui-log.c b/ui-log.c
index 41b5225..b9771fa 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -102,5 +102,5 @@ void print_commit(struct commit *commit)
                 add_lines = 0;
                 rem_lines = 0;
-                cgit_diff_commit(commit, inspect_files);
+                cgit_diff_commit(commit, inspect_files, ctx.qry.vpath);
                 html("</td><td>");
                 htmlf("%d", files);
@@ -163,5 +163,5 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
         argv[1] = disambiguate_ref(tip);
 
-        if (grep && pattern) {
+        if (grep && pattern && *pattern) {
                 if (!strcmp(grep, "grep") || !strcmp(grep, "author") ||
                     !strcmp(grep, "committer"))