Subversion Repositories prayer

Compare Revisions

Ignore whitespace Rev 139 → Rev 138

/trunk/debian/changelog
1,12 → 1,3
prayer (1.3.4-dfsg1-1) UNRELEASED; urgency=low
 
* New upstream release.
- Drop ipv6_v6only.patch; fixed upstream.
* template_sdk.patch: templates/src/build_index.pl no longer need to
be patched.
 
-- Magnus Holmgren <holmgren@debian.org> Mon, 27 Jun 2011 22:37:54 +0200
 
prayer (1.3.3-dfsg1-4) unstable; urgency=low
 
* Merge ld-as-needed.diff from Ubuntu into dlopen_templates.patch
/trunk/debian/patches/series
5,4 → 5,5
unbrand_accountd.patch
template_sdk.patch
no_db_version_check.patch
ipv6_v6only.patch
hurd.patch
/trunk/debian/patches/ipv6_v6only.patch
0,0 → 1,18
--- a/lib/os.c
+++ b/lib/os.c
@@ -217,6 +217,15 @@ int *os_bind_inet_socket(unsigned long p
close(sockfd);
return(NIL);
}
+#if defined(IPV6_V6ONLY) && defined(AF_INET6)
+ if (ai->ai_family == AF_INET6) {
+ if (setsockopt
+ (sockfd, IPPROTO_IPV6, IPV6_V6ONLY, (void *) &optval, sizeof(int)))
+ log_misc(("[os_bind_inet_socket()] setsockopt() failed: "
+ "couldn't set IPV6_V6ONLY: %s"), strerror(errno));
+ }
+#endif
+
/* bind() as Internet domain socket */
memcpy(&serv_addr, ai->ai_addr, ai->ai_addrlen);
/trunk/debian/patches/template_sdk.patch
193,3 → 193,15
+
+.PHONY: all install-sources install-libs clean distclean test
+.DELETE_ON_ERROR:
--- a/templates/src/build_index.pl
+++ b/templates/src/build_index.pl
@@ -18,7 +18,8 @@ foreach $i (@ARGV) {
@templates = sort(@templates);
print <<'EOM';
-#include "lib.h"
+#include "misc.h"
+#include "template_structs.h"
EOM