/trunk/debian/changelog |
---|
1,13 → 1,3 |
prayer (1.3.3-dfsg1-1) UNRELEASED; urgency=low |
* New upstream release. |
- Dropped kfreebsd.patch, clean_completely.patch, and |
manpage_error.patch; all incorporated upstream. |
* makefile_install_config.patch: Updated; some parts incorporated |
upstream. |
-- Magnus Holmgren <holmgren@debian.org> Thu, 22 Jul 2010 00:27:41 +0200 |
prayer (1.3.2-dfsg1-4) unstable; urgency=low |
* Undo inadvertent inclusion of /usr/include/prayer in |
/trunk/debian/patches/template_sdk.patch |
---|
2,16 → 2,16 |
+++ b/templates/src/Makefile |
@@ -11,7 +11,7 @@ LDFLAGS = $(BASELDFLAGS) |
LIB= ../../lib/lib_nossl.a |
LIB= ../../lib/lib_nossl.a $(BASE_LIBS) |
-all: template_expand template_compile |
+all: template_expand template_compile template-set.make |
template_expand: template_expand_main.o log.o empty.o $(LIB) |
$(CC) $(LDFLAGS) -o template_expand log.o empty.o template_expand_main.o $(LIB) $(BASE_LIBS) |
@@ -19,10 +19,28 @@ template_expand: template_expand_main.o |
$(CC) $(LDFLAGS) -o template_expand log.o empty.o template_expand_main.o $(LIB) |
@@ -19,10 +19,28 @@ template_expand: template_expand_main.o |
template_compile: template_compile_main.o log.o empty.o $(LIB) |
$(CC) $(LDFLAGS) -o template_compile log.o empty.o template_compile_main.o $(LIB) $(BASE_LIBS) |
$(CC) $(LDFLAGS) -o template_compile log.o empty.o template_compile_main.o $(LIB) |
+template-set.make: template-set.make.in |
+ find_templates () { sed -rn 's/.*template_expand\("([^"]*)".*/\1/p' "$$@" | sort -u; };\ |
38,25 → 38,19 |
clean: |
rm -f template_expand template_compile *.o *~ \#*\# |
--- a/templates/src/makedeps.pl |
--- /dev/null |
+++ b/templates/src/makedeps.pl |
@@ -4,51 +4,44 @@ |
# |
# Generate proper list of dependancies between templates |
-%uses = (); |
@@ -0,0 +1,45 @@ |
+#!/usr/bin/perl |
+# |
+# Generate proper list of dependancies between templates |
+ |
+my %index = (); |
+my %uses = (); |
-while ($file=shift(@ARGV)) { |
- $file = $1 if ($file =~ /([\w-_]+)\.t/); |
+ |
+sub scan { |
+ my ($file) = @_; |
- open(FILE, "<${file}.t") or die "failed to open ${file}: $!\n"; |
- |
- while (<FILE>) { |
- next unless /^%\s+CALL ([\w-_]+)/; |
+ |
+ if (!exists $uses{$file}) { |
+ grep { |
+ $_ ne '' and open(FILE, '<', "$_/${file}.t") |
66,60 → 60,29 |
+ $uses{$file}{$1} = 1 if /^%\s+CALL ([\w-_]+)/; |
+ } |
+ close(FILE); |
- $uses{$file} = [] if (not $uses{$file}); |
- push(@{$uses{$file}}, $1); |
+ |
+ foreach (keys %{$uses{$file}}) { |
+ $uses{$file}{$_} = 1 foreach keys %{scan($_)}; |
+ } |
+ $uses{$file}{$file} = 1; |
+ $index{$file} = 1; |
} |
- |
- close(FILE); |
+ } |
+ return $uses{$file} |
} |
-foreach $i (sort keys %uses) { |
- # Sort and uniq |
- @{$uses{$i}} = keys %{{ map { $_ => 1 } sort(@{$uses{$i}}) }}; |
+} |
+ |
+my $suffix = ''; |
+if ($ARGV[0] eq '--frontend') { |
+ shift; |
+ $suffix = '_frontend'; |
} |
+} |
+my $name = shift; |
-foreach $i (sort keys %uses) { |
- printf("%s.html: %s.t", $i, $i); |
- foreach $j (@{$uses{$i}}) { |
- @list = (); |
- recurse($j, {}, \@list); |
- foreach $k (@list) { |
- printf(" %s.t", $k); |
- } |
- } |
- printf("\n"); |
+ |
+$, = ' '; $\ = "\n"; |
+foreach my $i (@ARGV) { |
+ $i =~ s/([\w-_]+)\.t/$1/; |
+ print "$i.html:", map {"$_.t"} sort keys %{scan($i)}; |
} |
-exit(0); |
- |
-sub recurse { |
- my ($i, $usedref, $listref) = @_; |
- |
- # Remove repeated references to any given template/ |
- return if defined($$usedref{$i}); |
- $$usedref{$i} = 1; |
- |
- push (@{$listref}, $i); |
- foreach $j (@{$uses{$i}}) { |
- recurse($j, $usedref, $listref); |
- } |
-} |
+} |
+ |
+my @all = sort keys %index; |
+print "_template_index$suffix.c:", map {"$_.t"} @all; |
+print "$name$suffix.so:", "_template_index$suffix.o", map {"$_.o"} @all; |
/trunk/debian/patches/series |
---|
1,5 → 1,8 |
makefile_install_config.patch |
templates_fallback_to_compiled.patch |
kfreebsd.patch |
clean_completely.patch |
dlopen_templates.patch |
unbrand_cam_template.patch |
manpage_error.patch |
template_sdk.patch |
/trunk/debian/patches/manpage_error.patch |
---|
0,0 → 1,11 |
--- a/man/prayer-session.8 |
+++ b/man/prayer-session.8 |
@@ -72,7 +72,7 @@ Location of standard templates. The temp |
.Nm |
for performance reasons, so the template files are actually not |
used, but they are available for customization. |
-. |
+.El |
.Sh SEE ALSO |
. |
.Xr prayer 8 , |
/trunk/debian/patches/makefile_install_config.patch |
---|
75,7 → 75,7 |
# Master server will regenerate shared RSA key at this interval: |
ssl_rsakey_lifespan = 15m |
@@ -282,8 +282,9 @@ ssl_rsakey_lifespan = 15m |
@@ -282,26 +282,14 @@ ssl_rsakey_lifespan = 15m |
# RSA key remains fresh in child process for this long after first actual use. |
ssl_rsakey_freshen = 15m |
87,6 → 87,24 |
# EGD socket, if system has no /dev/urandom |
#egd_socket = "/var/prngd/urandom" |
###################################################################### |
- |
-# Direct connection stuff. Experimental! Leave this well alone unless you |
-# understand what it is for (DESIGN document provides detail for the curious). |
-direct_enable = FALSE |
- |
-# Following four options just define a set of (non-overlapping) ports for |
-# SSL and plaintext use if direct connection mode is enabled. |
-direct_ssl_first = 5000 |
-direct_ssl_count = 1000 |
-direct_plain_first = 4000 |
-direct_plain_count = 1000 |
- |
-###################################################################### |
# Session specific configuration |
# Session switches to idle mode after this much time: connections to IMAP |
@@ -376,13 +364,15 @@ sendmail_path = /usr/lib/sendmail |
ispell_path = /usr/bin/ispell |
168,3 → 186,14 |
# Size of small and large compose windows |
small_cols = 80 |
--- a/shared/config.c |
+++ b/shared/config.c |
@@ -167,7 +167,7 @@ struct config *config_create(void) |
config->fatal_dump_core = NIL; |
config->template_path = "../templates"; |
- config->template_set = "xhtml_strict"; |
+ config->template_set = "old"; |
config->template_use_compiled = T; |
config->template_list = NIL; |
/trunk/debian/patches/clean_completely.patch |
---|
0,0 → 1,11 |
--- a/lib/Makefile |
+++ b/lib/Makefile |
@@ -71,7 +71,7 @@ mymutex.o: mymutex.c mymutex_sem.c mymu |
$(CC) $(MYCFLAGS) $(MUTEX_DEF) -c $< |
clean: |
- rm -f lib.o $(OBJS) $(WITHSSL_OBJS) $(NOSSL_OBJS) *~ \#*\# |
+ rm -f lib.o $(OBJS) $(WITHSSL_OBJS) $(NOSSL_OBJS) *~ \#*\# $(TARGETS) |
install: all |
cp template_expand template_compile ../bin |
/trunk/debian/patches/kfreebsd.patch |
---|
0,0 → 1,38 |
--- a/lib/os.c |
+++ b/lib/os.c |
@@ -26,7 +26,7 @@ |
#include "os_linux.c" |
#elif (defined(SOLARIS)) |
#include "os_solaris.c" |
-#elif (defined(BSD) && BSD >= 199306) |
+#elif defined(__FreeBSD_kernel__) || (defined(BSD) && BSD >= 199306) |
#include "os_bsd.c" |
#else |
#error "No support for this operating system yet. Sorry!" |
--- a/lib/os_bsd.c |
+++ b/lib/os_bsd.c |
@@ -16,8 +16,12 @@ |
#include <arpa/inet.h> |
#include <signal.h> |
#include <netdb.h> |
- |
+#ifdef __GLIBC__ |
+#include <sys/file.h> |
+#include <pty.h> |
+#else |
#include <libutil.h> |
+#endif |
/* ====================================================================== */ |
--- a/lib/mymutex.c |
+++ b/lib/mymutex.c |
@@ -9,7 +9,7 @@ |
#include "lib.h" |
-#ifdef MUTEX_SEMAPHORE |
+#if defined(MUTEX_SEMAPHORE) && !defined(__stub_semtimedop) |
# include "mymutex_sem.c" |
#else |
# include "mymutex_file.c" |