/trunk/debian/prayer-accountd.manpages |
---|
File deleted |
/trunk/debian/source/format |
---|
File deleted |
/trunk/debian/prayer-accountd.8 |
---|
File deleted |
/trunk/debian/changelog |
---|
1,45 → 1,3 |
prayer (1.3.3-dfsg1-4) unstable; urgency=low |
* Merge ld-as-needed.diff from Ubuntu into dlopen_templates.patch |
(Closes: #607559). |
* dlopen_templates.patch: Add missing #include "dlopen_templates.h" to |
servers/prayer_shared.h. |
* hurd.patch (new): Use the SPT_CHANGEARGV implementation of |
setproctitle() on the Hurd. |
* Add basic manpage for prayer-accountd(8). |
* unbrand_accountd.patch: Remove some Cambridge-specific parts of the |
filter handling. |
* Drop obsolete Build-Depends alternative libc-client2007b-dev. |
* Increase Debhelper compat level to 7. |
-- Magnus Holmgren <holmgren@debian.org> Sun, 27 Mar 2011 22:49:18 +0200 |
prayer (1.3.3-dfsg1-3ubuntu1) natty; urgency=low |
* Fix FTBFS with ld --as-needed. |
-- Matthias Klose <doko@ubuntu.com> Sun, 19 Dec 2010 19:07:04 +0100 |
prayer (1.3.3-dfsg1-3) unstable; urgency=high |
* ipv6_v6only.patch (new): Set the IPV6_V6ONLY socket option on |
AF_INET6 sockets; since Prayer by default enumerates available address |
families and calls bind() once for each, conflicts will occur |
otherwise (Closes: #607261). |
-- Magnus Holmgren <holmgren@debian.org> Thu, 16 Dec 2010 20:16:41 +0100 |
prayer (1.3.3-dfsg1-2) unstable; urgency=high |
* Convert (trivially, since CDBS with quilt was already used) to source |
format 3.0 (quilt). |
* no_db_version_check.patch: Remove unnecessary and incorrect check that |
not only the major and minor version numbers of the current libdb are |
the same as at compile time, but also that the patch number is equal |
or greater, which should not be a concern (Closes: #592119). |
-- Magnus Holmgren <holmgren@debian.org> Sat, 07 Aug 2010 21:07:53 +0200 |
prayer (1.3.3-dfsg1-1) unstable; urgency=low |
* New upstream release. |
/trunk/debian/patches/unbrand_accountd.patch |
---|
File deleted |
/trunk/debian/patches/hurd.patch |
---|
File deleted |
/trunk/debian/patches/ipv6_v6only.patch |
---|
File deleted |
/trunk/debian/patches/no_db_version_check.patch |
---|
File deleted |
/trunk/debian/patches/series |
---|
2,8 → 2,4 |
templates_fallback_to_compiled.patch |
dlopen_templates.patch |
unbrand_cam_template.patch |
unbrand_accountd.patch |
template_sdk.patch |
no_db_version_check.patch |
ipv6_v6only.patch |
hurd.patch |
/trunk/debian/patches/dlopen_templates.patch |
---|
169,7 → 169,7 |
--- a/shared/shared.h |
+++ b/shared/shared.h |
@@ -40,3 +40,4 @@ extern int errno; /* just |
@@ -40,3 +40,4 @@ extern int errno; /* just |
#include "setproctitle.h" |
#include "mymutex.h" |
#include "log.h" |
176,18 → 176,16 |
+#include "dlopen_templates.h" |
--- a/servers/Makefile |
+++ b/servers/Makefile |
@@ -60,8 +60,8 @@ ifeq ($(strip $(ACCOUNTD_ENABLE)), true) |
endif |
@@ -73,7 +73,7 @@ ifeq ($(strip $(CCLIENT_KERB_ENABLE)), t |
endif |
-PRAYER_LIBS = $(BASE_LIBS) $(SERVER_SSL_LIBS) |
-SESSION_LIBS = $(BASE_LIBS) $(CCLIENT_LIBS) |
+PRAYER_LIBS = $(BASE_LIBS) $(SERVER_SSL_LIBS) -ldl |
+SESSION_LIBS = $(BASE_LIBS) $(CCLIENT_LIBS) -ldl |
MYCFLAGS = $(BASECFLAGS) $(SERVER_SSL_INCLUDE) $(CCLIENT_INCLUDE) |
-MYLDFLAGS = $(BASELDFLAGS) |
+MYLDFLAGS = $(BASELDFLAGS) -ldl |
# Add SSL if c-client needs SSL |
ifeq ($(strip $(CCLIENT_SSL_ENABLE)), true) |
@@ -90,15 +90,13 @@ TEMPLATES_FRONTEND= ../templates/index.o |
TEMPLATES= ../templates/index.o \ |
../templates/old/templates.a \ |
@@ -84,15 +84,13 @@ TEMPLATES_FRONTEND= ../templates/index.o |
../templates/cam/templates_frontend.a |
PRAYER_OBJS= prayer.o prayer_login.o prayer_server.o portlist.o \ |
217,7 → 215,7 |
ifeq ($(strip $(ACCOUNTD_ENABLE)), true) |
--- a/servers/session_exchange.c |
+++ b/servers/session_exchange.c |
@@ -144,6 +144,8 @@ BOOL session_exchange(struct session * s |
@@ -212,6 +212,8 @@ BOOL session_exchange(struct session * s |
else |
template_set = config->template_set; /* Safe default */ |
226,10 → 224,3 |
/* Set up template_vars ready for dispatch */ |
session->template_vals = tvals |
= template_vals_create(request->pool, |
--- a/servers/prayer_shared.h |
+++ b/servers/prayer_shared.h |
@@ -44,3 +44,4 @@ extern int errno; /* just |
#include "mymutex.h" |
#include "log.h" |
#include "utf8.h" |
+#include "dlopen_templates.h" |
/trunk/debian/control |
---|
2,10 → 2,10 |
Section: mail |
Priority: optional |
Maintainer: Magnus Holmgren <holmgren@debian.org> |
Build-Depends: cdbs, debhelper (>= 7), |
libc-client2007e-dev | libc-client-dev, |
Build-Depends: cdbs, debhelper (>= 5), quilt, |
libc-client2007e-dev | libc-client2007b-dev | libc-client-dev (>= 7:2007~), |
libldap2-dev, zlib1g-dev, libssl-dev (>= 0.9.6), libdb-dev, libtidy-dev |
Standards-Version: 3.9.1 |
Standards-Version: 3.9.0 |
Vcs-Svn: svn://svn.kibibyte.se/prayer/trunk |
Vcs-Browser: http://svn.kibibyte.se/prayer |
Homepage: http://www-uxsup.csx.cam.ac.uk/~dpc22/prayer/ |
/trunk/debian/rules |
---|
9,6 → 9,7 |
include /usr/share/cdbs/1/class/makefile.mk |
include /usr/share/cdbs/1/rules/debhelper.mk |
include /usr/share/cdbs/1/rules/patchsys-quilt.mk |
DEB_MAKE_INVOKE = $(DEB_MAKE_ENVVARS) $(MAKE) |
DEB_MAKE_INSTALL_TARGET = install BROOT=$(CURDIR)/debian/tmp |
/trunk/debian/README.source |
---|
0,0 → 1,8 |
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. For basic usage |
information, see |
/usr/share/doc/quilt/README.source |
(after installing quilt). |
/trunk/debian/compat |
---|
1,0 → 0,0 |
7 |
5 |