| /tags/1.3.3-dfsg1-4/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); |
| /tags/1.3.3-dfsg1-4/debian/patches/hurd.patch |
|---|
| 0,0 → 1,13 |
| --- a/lib/setproctitle.h |
| +++ b/lib/setproctitle.h |
| @@ -8,7 +8,9 @@ |
| #include <sys/param.h> |
| -#ifdef __linux__ |
| +#if defined(__GNU__) |
| +# define SPT_TYPE SPT_CHANGEARGV |
| +#elif defined(__linux__) |
| # define SPT_TYPE SPT_REUSEARGV |
| # define SPT_PADCHAR '\0' /* pad process title with nulls */ |
| #elif (defined(BSD) && BSD >= 199306) |
| /tags/1.3.3-dfsg1-4/debian/patches/no_db_version_check.patch |
|---|
| 0,0 → 1,24 |
| --- a/lib/mydb_db3.c |
| +++ b/lib/mydb_db3.c |
| @@ -190,21 +190,10 @@ static int myinit(const char *dbdir, int |
| static int init(const char *dbdir, int myflags) |
| { |
| - int maj, min, patch; |
| - char *vstr; |
| int r; |
| if (dbinit++) return 0; |
| - vstr = db_version(&maj, &min, &patch); |
| - if (maj != DB_VERSION_MAJOR || min != DB_VERSION_MINOR || |
| - DB_VERSION_PATCH > patch) { |
| - log_fatal("incorrect version of Berkeley db: " |
| - "compiled against %d.%d.%d, linked against %d.%d.%d", |
| - DB_VERSION_MAJOR, DB_VERSION_MINOR, DB_VERSION_PATCH, |
| - maj, min, patch); |
| - } |
| - |
| if (!(r = myinit(dbdir, myflags))) |
| return(0); |
| /tags/1.3.3-dfsg1-4/debian/patches/unbrand_accountd.patch |
|---|
| 0,0 → 1,32 |
| --- a/accountd/filter.c |
| +++ b/accountd/filter.c |
| @@ -266,7 +266,6 @@ filter_print_vacation(struct config *con |
| fprintf(file, "# MSshell :: vacation\n"); |
| fprintf(file, "if personal\n"); |
| - fprintf(file, " alias %s@cam.ac.uk\n", pwd->pw_name); |
| if (!filter_print_aliases(config, file)) |
| return (NIL); |
| @@ -278,7 +277,7 @@ filter_print_vacation(struct config *con |
| fprintf(file, ("This message is automatically generated " |
| "in response to your mail\\n\\" "\n")); |
| fprintf(file, ("message (perhaps re-directed) to " |
| - "$local_part@hermes.cam.ac.uk.\\n\\n\"\n")); |
| + "$local_part@$local_domain.\\n\\n\"\n")); |
| fprintf(file, " file ${home}/vacation.message\n"); |
| fprintf(file, " log ${home}/vacation.log\n"); |
| fprintf(file, " once ${home}/vacation.once\n"); |
| @@ -307,10 +306,10 @@ filter_print_spam(struct config *config, |
| threshold = atoi(filter->threshold); |
| /* XXX (threshold == 0) okay? */ |
| - fprintf(file, "if $h_X-Cam-SpamScore contains \""); |
| + fprintf(file, "if $h_X-Spam-Level contains \""); |
| for (i=0 ; i < threshold; i++) |
| - fputc('s', file); |
| + fputc('*', file); |
| fprintf(file, "\" then\n"); |
| fprintf(file, " save mail/spam\n"); |
| /tags/1.3.3-dfsg1-4/debian/patches/series |
|---|
| 2,4 → 2,8 |
| 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 |
| /tags/1.3.3-dfsg1-4/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,16 → 176,18 |
| +#include "dlopen_templates.h" |
| --- a/servers/Makefile |
| +++ b/servers/Makefile |
| @@ -73,7 +73,7 @@ ifeq ($(strip $(CCLIENT_KERB_ENABLE)), t |
| @@ -60,8 +60,8 @@ ifeq ($(strip $(ACCOUNTD_ENABLE)), true) |
| endif |
| endif |
| MYCFLAGS = $(BASECFLAGS) $(SERVER_SSL_INCLUDE) $(CCLIENT_INCLUDE) |
| -MYLDFLAGS = $(BASELDFLAGS) |
| +MYLDFLAGS = $(BASELDFLAGS) -ldl |
| -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 |
| TEMPLATES= ../templates/index.o \ |
| ../templates/old/templates.a \ |
| @@ -84,15 +84,13 @@ TEMPLATES_FRONTEND= ../templates/index.o |
| # Add SSL if c-client needs SSL |
| ifeq ($(strip $(CCLIENT_SSL_ENABLE)), true) |
| @@ -90,15 +90,13 @@ TEMPLATES_FRONTEND= ../templates/index.o |
| ../templates/cam/templates_frontend.a |
| PRAYER_OBJS= prayer.o prayer_login.o prayer_server.o portlist.o \ |
| 215,7 → 217,7 |
| ifeq ($(strip $(ACCOUNTD_ENABLE)), true) |
| --- a/servers/session_exchange.c |
| +++ b/servers/session_exchange.c |
| @@ -212,6 +212,8 @@ BOOL session_exchange(struct session * s |
| @@ -144,6 +144,8 @@ BOOL session_exchange(struct session * s |
| else |
| template_set = config->template_set; /* Safe default */ |
| 224,3 → 226,10 |
| /* 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" |